diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 60499758de40..c72b814b8a07 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -123,15 +123,15 @@ endif
 ifneq ($(ENABLE_SKIA),)
 define gb_LinkTarget__use_skia
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,skia)/include/core \
-	-I$(call gb_UnpackedTarball_get_dir,skia)/include/effects \
-	-I$(call gb_UnpackedTarball_get_dir,skia)/include/gpu \
-	-I$(call gb_UnpackedTarball_get_dir,skia)/include/config \
-	-I$(call gb_UnpackedTarball_get_dir,skia)/include/ports \
-	-I$(call gb_UnpackedTarball_get_dir,skia)/include/private \
-	-I$(call gb_UnpackedTarball_get_dir,skia)/include/third_party/vulkan \
-	-I$(call gb_UnpackedTarball_get_dir,skia)/tools/gpu \
-	-I$(call gb_UnpackedTarball_get_dir,skia) \
+	-I$(gb_UnpackedTarball_workdir)/skia/include/core \
+	-I$(gb_UnpackedTarball_workdir)/skia/include/effects \
+	-I$(gb_UnpackedTarball_workdir)/skia/include/gpu \
+	-I$(gb_UnpackedTarball_workdir)/skia/include/config \
+	-I$(gb_UnpackedTarball_workdir)/skia/include/ports \
+	-I$(gb_UnpackedTarball_workdir)/skia/include/private \
+	-I$(gb_UnpackedTarball_workdir)/skia/include/third_party/vulkan \
+	-I$(gb_UnpackedTarball_workdir)/skia/tools/gpu \
+	-I$(gb_UnpackedTarball_workdir)/skia \
 	-I$(SRCDIR)/external/skia/inc/ \
 	$$(INCLUDE) \
 )
@@ -151,7 +151,7 @@ ifeq (SANE,$(filter SANE,$(BUILD_TYPE)))
 define gb_LinkTarget__use_sane_headers
 $(call gb_LinkTarget_set_include,$(1),\
     $(if $(filter WNT,$(OS)), \
-        -I$(call gb_UnpackedTarball_get_dir,twain_dsm/pub/include), \
+        -I$(gb_UnpackedTarball_workdir)/twain_dsm/pub/include, \
         -I$(SRCDIR)/external/sane/inc) \
     $$(INCLUDE) \
 )
@@ -206,17 +206,17 @@ define gb_LinkTarget__use_cppunit
 $(call gb_LinkTarget_use_external_project,$(1),cppunit, full)
 
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,cppunit/include)\
+	-I$(gb_UnpackedTarball_workdir)/cppunit/include\
 	$$(INCLUDE) \
 )
 
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,cppunit)/src/cppunit/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll/cppunitd_dll.lib,ReleaseDll/cppunit_dll.lib) \
+	$(gb_UnpackedTarball_workdir)/cppunit/src/cppunit/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll/cppunitd_dll.lib,ReleaseDll/cppunit_dll.lib) \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,cppunit)/src/cppunit/.libs -lcppunit \
+	-L$(gb_UnpackedTarball_workdir)/cppunit/src/cppunit/.libs -lcppunit \
 )
 endif
 
@@ -243,7 +243,7 @@ else # !SYSTEM_EPOXY
 
 define gb_LinkTarget__use_epoxy
 $(call gb_LinkTarget_set_include,$(1),\
-       -I$(call gb_UnpackedTarball_get_dir,epoxy/include) \
+       -I$(gb_UnpackedTarball_workdir)/epoxy/include \
        $$(INCLUDE) \
 )
 
@@ -430,7 +430,7 @@ else
 
 define gb_LinkTarget__use_libjpeg
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libjpeg-turbo) \
+	-I$(gb_UnpackedTarball_workdir)/libjpeg-turbo \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_use_static_libraries,$(1),libjpeg-turbo)
@@ -459,7 +459,7 @@ else # !SYSTEM_MYTHES
 
 define gb_LinkTarget__use_mythes
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,mythes) \
+	-I$(gb_UnpackedTarball_workdir)/mythes \
 	$$(INCLUDE) \
 )
 
@@ -498,7 +498,7 @@ define gb_LinkTarget__use_expat_impl
 $(if $(2),,$(error gb_LinkTarget__use_expat_impl needs additional parameter))
 
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,expat)/lib \
+	-I$(gb_UnpackedTarball_workdir)/expat/lib \
     $$(INCLUDE) \
 )
 
@@ -537,7 +537,7 @@ else # !SYSTEM_HYPH
 define gb_LinkTarget__use_hyphen
 $(call gb_LinkTarget_use_unpacked,$(1),hyphen)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,hyphen)\
+	-I$(gb_UnpackedTarball_workdir)/hyphen\
 	$$(INCLUDE) \
 )
 
@@ -576,7 +576,7 @@ $(call gb_LinkTarget_add_defs,$(1),\
 )
 $(call gb_LinkTarget_use_unpacked,$(1),hunspell)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,hunspell/src/hunspell)\
+	-I$(gb_UnpackedTarball_workdir)/hunspell/src/hunspell\
 	$$(INCLUDE) \
 )
 
@@ -740,7 +740,7 @@ else # !SYSTEM_LIBCMIS
 
 define gb_LinkTarget__use_libcmis
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libcmis)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libcmis/inc \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_use_static_libraries,$(1),\
@@ -791,7 +791,7 @@ $(call gb_LinkTarget_use_external_project,$(1),\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib -latomic_ops \
+	-L$(gb_UnpackedTarball_workdir)/libatomic_ops/src/lib -latomic_ops \
 )
 
 endef
@@ -822,7 +822,7 @@ else # !SYSTEM_LIBEXTTEXTCAT
 
 define gb_LinkTarget__use_libexttextcat
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libexttextcat/src) \
+	-I$(gb_UnpackedTarball_workdir)/libexttextcat/src \
 	$$(INCLUDE) \
 )
 
@@ -832,7 +832,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libexttextcat)/src/.libs/libexttextcat-2.0.a\
+	$(gb_UnpackedTarball_workdir)/libexttextcat/src/.libs/libexttextcat-2.0.a\
 )
 $(call gb_LinkTarget_use_external_project,$(1),libexttextcat)
 endif
@@ -866,7 +866,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo, \
 define gb_LinkTarget__use_libnumbertext
 $(call gb_LinkTarget_use_package,$(1),libnumbertext_numbertext)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libnumbertext/src) \
+	-I$(gb_UnpackedTarball_workdir)/libnumbertext/src \
 	$$(INCLUDE) \
 )
 
@@ -877,7 +877,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
 else
 
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libnumbertext)/src/.libs/libnumbertext-1.0.a\
+	$(gb_UnpackedTarball_workdir)/libnumbertext/src/.libs/libnumbertext-1.0.a\
 )
 $(call gb_LinkTarget_use_external_project,$(1),libnumbertext,full)
 
@@ -968,16 +968,16 @@ define gb_LinkTarget__use_libxslt
 $(call gb_LinkTarget_use_package,$(1),libxslt)
 $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
-	-I$(call gb_UnpackedTarball_get_dir,libxslt) \
+	-I$(gb_UnpackedTarball_workdir)/libxslt \
 )
 
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libxslt)/win32/bin.msvc/libxslt.lib \
+	$(gb_UnpackedTarball_workdir)/libxslt/win32/bin.msvc/libxslt.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,libxslt)/libxslt/.libs -lxslt \
+	-L$(gb_UnpackedTarball_workdir)/libxslt/libxslt/.libs -lxslt \
 )
 endif
 
@@ -987,16 +987,16 @@ define gb_LinkTarget__use_libexslt
 $(call gb_LinkTarget_use_package,$(1),libxslt)
 $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
-	-I$(call gb_UnpackedTarball_get_dir,libxslt) \
+	-I$(gb_UnpackedTarball_workdir)/libxslt \
 )
 
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libxslt)/win32/bin.msvc/libexslt.lib \
+	$(gb_UnpackedTarball_workdir)/libxslt/win32/bin.msvc/libexslt.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,libxslt)/libexslt/.libs -lexslt \
+	-L$(gb_UnpackedTarball_workdir)/libxslt/libexslt/.libs -lexslt \
 )
 endif
 
@@ -1115,7 +1115,7 @@ else # !SYSTEM_REDLAND
 
 define gb_LinkTarget__use_redland_headers
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,redland)/src \
+	-I$(gb_UnpackedTarball_workdir)/redland/src \
 	$$(INCLUDE) \
 )
 
@@ -1123,7 +1123,7 @@ endef
 
 define gb_LinkTarget__use_raptor_headers
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,raptor)/src \
+	-I$(gb_UnpackedTarball_workdir)/raptor/src \
 	$$(INCLUDE) \
 )
 
@@ -1131,7 +1131,7 @@ endef
 
 define gb_LinkTarget__use_rasqal_headers
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,rasqal)/src \
+	-I$(gb_UnpackedTarball_workdir)/rasqal/src \
 	$$(INCLUDE) \
 )
 
@@ -1163,9 +1163,9 @@ else
 $(call gb_LinkTarget_use_packages,$(1),redland raptor rasqal)
 
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,redland)/src/.libs -lrdf \
-	-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 \
-	-L$(call gb_UnpackedTarball_get_dir,rasqal)/src/.libs -lrasqal \
+	-L$(gb_UnpackedTarball_workdir)/redland/src/.libs -lrdf \
+	-L$(gb_UnpackedTarball_workdir)/raptor/src/.libs -lraptor2 \
+	-L$(gb_UnpackedTarball_workdir)/rasqal/src/.libs -lrasqal \
 )
 endif
 
@@ -1208,17 +1208,17 @@ $(call gb_LinkTarget_use_package,$(1),cairo)
 $(call gb_LinkTarget_use_package,$(1),pixman)
 $(call gb_LinkTarget_use_external,$(1),freetype_headers)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,cairo) \
-	-I$(call gb_UnpackedTarball_get_dir,cairo)/src \
-	-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman \
+	-I$(gb_UnpackedTarball_workdir)/cairo \
+	-I$(gb_UnpackedTarball_workdir)/cairo/src \
+	-I$(gb_UnpackedTarball_workdir)/pixman/pixman \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
 	$(if $(filter EMSCRIPTEN,$(OS)), \
-		$(call gb_UnpackedTarball_get_dir,cairo)/src/.libs/libcairo.a \
-		$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs/libpixman-1.a, \
-		-L$(call gb_UnpackedTarball_get_dir,cairo)/src/.libs -lcairo \
-		-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1) \
+		$(gb_UnpackedTarball_workdir)/cairo/src/.libs/libcairo.a \
+		$(gb_UnpackedTarball_workdir)/pixman/pixman/.libs/libpixman-1.a, \
+		-L$(gb_UnpackedTarball_workdir)/cairo/src/.libs -lcairo \
+		-L$(gb_UnpackedTarball_workdir)/pixman/pixman/.libs -lpixman-1) \
 )
 
 endef
@@ -1300,12 +1300,12 @@ else
 $(call gb_LinkTarget_use_external_project,$(1),fontconfig)
 endif
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,fontconfig) \
+	-I$(gb_UnpackedTarball_workdir)/fontconfig \
 	$$(INCLUDE) \
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-    -L$(call gb_UnpackedTarball_get_dir,fontconfig)/src/.libs -lfontconfig \
+    -L$(gb_UnpackedTarball_workdir)/fontconfig/src/.libs -lfontconfig \
 )
 
 endef
@@ -1335,7 +1335,7 @@ else # !SYSTEM_GRAPHITE
 define gb_LinkTarget__use_graphite
 $(call gb_LinkTarget_use_unpacked,$(1),graphite)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,graphite/include) \
+	-I$(gb_UnpackedTarball_workdir)/graphite/include \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_use_static_libraries,$(1),\
@@ -1389,9 +1389,9 @@ endif
 define gb_LinkTarget__use_icu_headers
 $(call gb_LinkTarget_use_unpacked,$(1),icu)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,icu)/source \
-	-I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
-	-I$(call gb_UnpackedTarball_get_dir,icu)/source/common \
+	-I$(gb_UnpackedTarball_workdir)/icu/source \
+	-I$(gb_UnpackedTarball_workdir)/icu/source/i18n \
+	-I$(gb_UnpackedTarball_workdir)/icu/source/common \
 	$$(INCLUDE) \
 )
 
@@ -1408,11 +1408,11 @@ $(call gb_LinkTarget_use_package,$(1),icu_ure)
 
 ifeq ($(OS),WNT)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,icu)/source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \
+	$(gb_UnpackedTarball_workdir)/icu/source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,icu)/source/lib -licudata$(gb_ICU_suffix) \
+	-L$(gb_UnpackedTarball_workdir)/icu/source/lib -licudata$(gb_ICU_suffix) \
 )
 endif
 
@@ -1423,11 +1423,11 @@ $(call gb_LinkTarget_use_package,$(1),icu)
 
 ifeq ($(OS),WNT)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,icu)/source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \
+	$(gb_UnpackedTarball_workdir)/icu/source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,icu)/source/lib -licui18n$(gb_ICU_suffix) \
+	-L$(gb_UnpackedTarball_workdir)/icu/source/lib -licui18n$(gb_ICU_suffix) \
 )
 endif
 
@@ -1438,11 +1438,11 @@ $(call gb_LinkTarget_use_package,$(1),icu_ure)
 
 ifeq ($(OS),WNT)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,icu)/source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \
+	$(gb_UnpackedTarball_workdir)/icu/source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,icu)/source/lib -licuuc$(gb_ICU_suffix) \
+	-L$(gb_UnpackedTarball_workdir)/icu/source/lib -licuuc$(gb_ICU_suffix) \
 )
 endif
 
@@ -1519,7 +1519,7 @@ endef
 define gb_LinkTarget__use_openssl_headers
 $(call gb_LinkTarget_use_external_project,$(1),openssl,full)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,openssl)/include \
+	-I$(gb_UnpackedTarball_workdir)/openssl/include \
 	$$(INCLUDE) \
 )
 
@@ -1529,13 +1529,13 @@ define gb_LinkTarget__use_openssl
 $(call gb_LinkTarget_use_package,$(1),openssl)
 ifeq ($(OS),WNT)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,openssl)/libcrypto.lib \
-	$(call gb_UnpackedTarball_get_dir,openssl)/libssl.lib \
+	$(gb_UnpackedTarball_workdir)/openssl/libcrypto.lib \
+	$(gb_UnpackedTarball_workdir)/openssl/libssl.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,openssl)/libssl.a \
-	$(call gb_UnpackedTarball_get_dir,openssl)/libcrypto.a \
+	$(gb_UnpackedTarball_workdir)/openssl/libssl.a \
+	$(gb_UnpackedTarball_workdir)/openssl/libcrypto.a \
 	$(if $(filter $(OS),LINUX),-pthread) \
 )
 $(call gb_LinkTarget_use_external_project,$(1),openssl)
@@ -1597,11 +1597,11 @@ else # !SYSTEM_CDR
 
 define gb_LinkTarget__use_cdr
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libcdr)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libcdr/inc \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libcdr)/src/lib/.libs/libcdr-0.1$(gb_StaticLibrary_PLAINEXT) \
+	$(gb_UnpackedTarball_workdir)/libcdr/src/lib/.libs/libcdr-0.1$(gb_StaticLibrary_PLAINEXT) \
 )
 $(call gb_LinkTarget_use_external_project,$(1),libcdr)
 endef
@@ -1630,7 +1630,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libebook)/src/lib/.libs/libe-book-0.1$(gb_StaticLibrary_PLAINEXT) \
+	$(gb_UnpackedTarball_workdir)/libebook/src/lib/.libs/libe-book-0.1$(gb_StaticLibrary_PLAINEXT) \
 )
 $(call gb_LinkTarget_use_external_project,$(1),libebook)
 
@@ -1667,7 +1667,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
 
 define gb_LinkTarget__use_etonyek
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libetonyek)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libetonyek/inc \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_use_libraries,$(1),\
@@ -1691,7 +1691,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,libetonyek)/src/lib/.libs -letonyek-0.1 \
+	-L$(gb_UnpackedTarball_workdir)/libetonyek/src/lib/.libs -letonyek-0.1 \
 )
 $(call gb_LinkTarget_use_external_project,$(1),libetonyek)
 
@@ -1728,7 +1728,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libfreehand)/src/lib/.libs/libfreehand-0.1$(gb_StaticLibrary_PLAINEXT) \
+	$(gb_UnpackedTarball_workdir)/libfreehand/src/lib/.libs/libfreehand-0.1$(gb_StaticLibrary_PLAINEXT) \
 )
 $(call gb_LinkTarget_use_external_project,$(1),libfreehand)
 
@@ -1763,7 +1763,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
 
 define gb_LinkTarget__use_odfgen
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libodfgen)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libodfgen/inc \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_use_libraries,$(1),\
@@ -1782,12 +1782,12 @@ define gb_LinkTarget__use_odfgen
 $(call gb_LinkTarget_use_package,$(1),libodfgen)
 
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libodfgen)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libodfgen/inc \
 	-DLIBODFGEN_VISIBILITY \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,libodfgen)/src/.libs -lodfgen-0.1 \
+	-L$(gb_UnpackedTarball_workdir)/libodfgen/src/.libs -lodfgen-0.1 \
 )
 
 endef
@@ -1813,11 +1813,11 @@ ifneq ($(ENABLE_WASM_STRIP_EPUB),TRUE)
 
 define gb_LinkTarget__use_epubgen
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libepubgen)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libepubgen/inc \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libepubgen)/src/lib/.libs/libepubgen-0.1$(gb_StaticLibrary_PLAINEXT) \
+	$(gb_UnpackedTarball_workdir)/libepubgen/src/lib/.libs/libepubgen-0.1$(gb_StaticLibrary_PLAINEXT) \
 )
 $(call gb_LinkTarget_use_external_project,$(1),libepubgen)
 
@@ -1912,11 +1912,11 @@ else # !SYSTEM_ABW
 
 define gb_LinkTarget__use_abw
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libabw)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libabw/inc \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libabw)/src/lib/.libs/libabw-0.1$(gb_StaticLibrary_PLAINEXT) \
+	$(gb_UnpackedTarball_workdir)/libabw/src/lib/.libs/libabw-0.1$(gb_StaticLibrary_PLAINEXT) \
 )
 $(call gb_LinkTarget_use_external_project,$(1),libabw)
 
@@ -1944,11 +1944,11 @@ else # !SYSTEM_MSPUB
 
 define gb_LinkTarget__use_mspub
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libmspub)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libmspub/inc \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libmspub)/src/lib/.libs/libmspub-0.1$(gb_StaticLibrary_PLAINEXT) \
+	$(gb_UnpackedTarball_workdir)/libmspub/src/lib/.libs/libmspub-0.1$(gb_StaticLibrary_PLAINEXT) \
 )
 $(call gb_LinkTarget_use_external_project,$(1),libmspub)
 
@@ -1973,11 +1973,11 @@ else # !SYSTEM_PAGEMAKER
 
 define gb_LinkTarget__use_pagemaker
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libpagemaker)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libpagemaker/inc \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libpagemaker)/src/lib/.libs/libpagemaker-0.0$(gb_StaticLibrary_PLAINEXT) \
+	$(gb_UnpackedTarball_workdir)/libpagemaker/src/lib/.libs/libpagemaker-0.0$(gb_StaticLibrary_PLAINEXT) \
 )
 $(call gb_LinkTarget_use_external_project,$(1),libpagemaker)
 
@@ -2006,11 +2006,11 @@ else # !SYSTEM_QXP
 
 define gb_LinkTarget__use_qxp
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libqxp)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libqxp/inc \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libqxp)/src/lib/.libs/libqxp-0.0$(gb_StaticLibrary_PLAINEXT) \
+	$(gb_UnpackedTarball_workdir)/libqxp/src/lib/.libs/libqxp-0.0$(gb_StaticLibrary_PLAINEXT) \
 )
 $(call gb_LinkTarget_use_external_project,$(1),libqxp)
 
@@ -2039,11 +2039,11 @@ else # !SYSTEM_ZMF
 
 define gb_LinkTarget__use_zmf
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libzmf)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libzmf/inc \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libzmf)/src/lib/.libs/libzmf-0.0$(gb_StaticLibrary_PLAINEXT) \
+	$(gb_UnpackedTarball_workdir)/libzmf/src/lib/.libs/libzmf-0.0$(gb_StaticLibrary_PLAINEXT) \
 )
 $(call gb_LinkTarget_use_external_project,$(1),libzmf)
 
@@ -2071,11 +2071,11 @@ else # !SYSTEM_VISIO
 
 define gb_LinkTarget__use_visio
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libvisio)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libvisio/inc \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libvisio)/src/lib/.libs/libvisio-0.1$(gb_StaticLibrary_PLAINEXT) \
+	$(gb_UnpackedTarball_workdir)/libvisio/src/lib/.libs/libvisio-0.1$(gb_StaticLibrary_PLAINEXT) \
 )
 $(call gb_LinkTarget_use_external_project,$(1),libvisio)
 
@@ -2171,7 +2171,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
 
 define gb_LinkTarget__use_wpg
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libwpg)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libwpg/inc \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_use_libraries,$(1),\
@@ -2190,11 +2190,11 @@ define gb_LinkTarget__use_wpg
 $(call gb_LinkTarget_use_package,$(1),libwpg)
 
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libwpg)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libwpg/inc \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,libwpg)/src/lib/.libs -lwpg-0.3 \
+	-L$(gb_UnpackedTarball_workdir)/libwpg/src/lib/.libs -lwpg-0.3 \
 )
 
 endef
@@ -2226,7 +2226,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
 
 define gb_LinkTarget__use_wps
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libwps)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libwps/inc \
 	$$(INCLUDE) \
 )
 
@@ -2246,11 +2246,11 @@ define gb_LinkTarget__use_wps
 $(call gb_LinkTarget_use_package,$(1),libwps)
 
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libwps)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libwps/inc \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,libwps)/src/lib/.libs -lwps-0.4 \
+	-L$(gb_UnpackedTarball_workdir)/libwps/src/lib/.libs -lwps-0.4 \
 )
 
 endef
@@ -2281,7 +2281,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
 
 define gb_LinkTarget__use_mwaw
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libmwaw)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libmwaw/inc \
 	$$(INCLUDE) \
 )
 
@@ -2301,11 +2301,11 @@ define gb_LinkTarget__use_mwaw
 $(call gb_LinkTarget_use_package,$(1),libmwaw)
 
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libmwaw)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libmwaw/inc \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,libmwaw)/src/lib/.libs -lmwaw-0.3 \
+	-L$(gb_UnpackedTarball_workdir)/libmwaw/src/lib/.libs -lmwaw-0.3 \
 )
 
 endef
@@ -2335,7 +2335,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
 
 define gb_LinkTarget__use_staroffice
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libstaroffice)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libstaroffice/inc \
 	$$(INCLUDE) \
 )
 
@@ -2355,11 +2355,11 @@ define gb_LinkTarget__use_staroffice
 $(call gb_LinkTarget_use_package,$(1),libstaroffice)
 
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libstaroffice)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libstaroffice/inc \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,libstaroffice)/src/lib/.libs -lstaroffice-0.0 \
+	-L$(gb_UnpackedTarball_workdir)/libstaroffice/src/lib/.libs -lstaroffice-0.0 \
 )
 
 endef
@@ -2398,7 +2398,7 @@ ifeq ($(OS),ANDROID)
 define gb_LinkTarget__use_lcms2
 $(call gb_LinkTarget_use_package,$(1),lcms2)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,lcms2/include) \
+	-I$(gb_UnpackedTarball_workdir)/lcms2/include \
 	$$(INCLUDE) \
 )
 
@@ -2409,7 +2409,7 @@ else
 define gb_LinkTarget__use_lcms2
 $(call gb_LinkTarget_use_package,$(1),lcms2)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,lcms2/include) \
+	-I$(gb_UnpackedTarball_workdir)/lcms2/include \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS))
@@ -2437,15 +2437,15 @@ define gb_LinkTarget__use_lpsolve
 $(call gb_LinkTarget_use_package,$(1),lpsolve)
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,lpsolve)/lpsolve55/lpsolve55.lib \
+	$(gb_UnpackedTarball_workdir)/lpsolve/lpsolve55/lpsolve55.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,lpsolve)/lpsolve55 -llpsolve55 \
+	-L$(gb_UnpackedTarball_workdir)/lpsolve/lpsolve55 -llpsolve55 \
 )
 endif
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,lpsolve) \
+	-I$(gb_UnpackedTarball_workdir)/lpsolve \
 	$$(INCLUDE) \
 )
 
@@ -2471,22 +2471,22 @@ define gb_LinkTarget__use_coinmp
 $(call gb_LinkTarget_use_package,$(1),coinmp)
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/$(wnt_arch_subdir_optional)$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.lib \
+	$(gb_UnpackedTarball_workdir)/coinmp/CoinMP/MSVisualStudio/v9/$(wnt_arch_subdir_optional)$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,coinmp)/Cbc/src/.libs -lCbc -lCbcSolver \
-	-L$(call gb_UnpackedTarball_get_dir,coinmp)/Cgl/src/.libs -lCgl \
-	-L$(call gb_UnpackedTarball_get_dir,coinmp)/Clp/src/.libs -lClp \
-	-L$(call gb_UnpackedTarball_get_dir,coinmp)/Clp/src/OsiClp/.libs -lOsiClp \
-	-L$(call gb_UnpackedTarball_get_dir,coinmp)/CoinMP/src/.libs -lCoinMP \
-	-L$(call gb_UnpackedTarball_get_dir,coinmp)/CoinUtils/src/.libs -lCoinUtils \
-	-L$(call gb_UnpackedTarball_get_dir,coinmp)/Osi/src/Osi/.libs -lOsi \
+	-L$(gb_UnpackedTarball_workdir)/coinmp/Cbc/src/.libs -lCbc -lCbcSolver \
+	-L$(gb_UnpackedTarball_workdir)/coinmp/Cgl/src/.libs -lCgl \
+	-L$(gb_UnpackedTarball_workdir)/coinmp/Clp/src/.libs -lClp \
+	-L$(gb_UnpackedTarball_workdir)/coinmp/Clp/src/OsiClp/.libs -lOsiClp \
+	-L$(gb_UnpackedTarball_workdir)/coinmp/CoinMP/src/.libs -lCoinMP \
+	-L$(gb_UnpackedTarball_workdir)/coinmp/CoinUtils/src/.libs -lCoinUtils \
+	-L$(gb_UnpackedTarball_workdir)/coinmp/Osi/src/Osi/.libs -lOsi \
 )
 endif
 $(call gb_LinkTarget_set_include,$(1),\
-   -I$(call gb_UnpackedTarball_get_dir,coinmp)/CoinMP/src \
-   -I$(call gb_UnpackedTarball_get_dir,coinmp)/CoinUtils/src \
+   -I$(gb_UnpackedTarball_workdir)/coinmp/CoinMP/src \
+   -I$(gb_UnpackedTarball_workdir)/coinmp/CoinUtils/src \
    $$(INCLUDE) \
 )
 
@@ -2519,7 +2519,7 @@ ifneq (,$(filter MDNSRESPONDER,$(BUILD_TYPE)))
 
 define gb_LinkTarget__use_mDNSResponder
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,mDNSResponder)/mDNSShared \
+	-I$(gb_UnpackedTarball_workdir)/mDNSResponder/mDNSShared \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_use_static_libraries,$(1),mDNSResponder)
@@ -2677,16 +2677,16 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libtiff)/libtiff \
+	-I$(gb_UnpackedTarball_workdir)/libtiff/libtiff \
 	$$(INCLUDE) \
 )
 ifeq ($(OS),WNT)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libtiff)/libtiff/.libs/libtiff$(gb_StaticLibrary_PLAINEXT) \
+	$(gb_UnpackedTarball_workdir)/libtiff/libtiff/.libs/libtiff$(gb_StaticLibrary_PLAINEXT) \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,libtiff)/libtiff/.libs -ltiff \
+	-L$(gb_UnpackedTarball_workdir)/libtiff/libtiff/.libs -ltiff \
 )
 endif
 $(call gb_LinkTarget_use_external_project,$(1),libtiff,full)
@@ -2725,17 +2725,17 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libwebp)/src \
+	-I$(gb_UnpackedTarball_workdir)/libwebp/src \
 	$$(INCLUDE) \
 )
 ifeq ($(OS),WNT)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libwebp)/output/lib/libwebp$(if $(MSVC_USE_DEBUG_RUNTIME),_debug)$(gb_StaticLibrary_PLAINEXT) \
+	$(gb_UnpackedTarball_workdir)/libwebp/output/lib/libwebp$(if $(MSVC_USE_DEBUG_RUNTIME),_debug)$(gb_StaticLibrary_PLAINEXT) \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,libwebp)/src/.libs -lwebp \
-	-L$(call gb_UnpackedTarball_get_dir,libwebp)/sharpyuv/.libs -lsharpyuv \
+	-L$(gb_UnpackedTarball_workdir)/libwebp/src/.libs -lwebp \
+	-L$(gb_UnpackedTarball_workdir)/libwebp/sharpyuv/.libs -lsharpyuv \
 )
 endif
 $(call gb_LinkTarget_use_external_project,$(1),libwebp)
@@ -2774,17 +2774,17 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 define gb_LinkTarget__use_curl
 $(call gb_LinkTarget_use_package,$(1),curl)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,curl/include) \
+	-I$(gb_UnpackedTarball_workdir)/curl/include \
 	$$(INCLUDE) \
 )
 
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,curl)/builds/libcurl-vc12-$(gb_MSBUILD_PLATFORM)-$(gb_MSBUILD_CONFIG)-dll-zlib-static-ipv6-sspi-schannel/lib/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),_debug).lib \
+	$(gb_UnpackedTarball_workdir)/curl/builds/libcurl-vc12-$(gb_MSBUILD_PLATFORM)-$(gb_MSBUILD_CONFIG)-dll-zlib-static-ipv6-sspi-schannel/lib/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),_debug).lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,curl)/lib/.libs -lcurl \
+	-L$(gb_UnpackedTarball_workdir)/curl/lib/.libs -lcurl \
 )
 endif
 
@@ -2840,9 +2840,9 @@ define gb_LinkTarget__use_poppler
 $(call gb_LinkTarget_use_external_project,$(1),poppler,full)
 $(call gb_LinkTarget_use_package,$(1),poppler_data)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,poppler) \
-	-I$(call gb_UnpackedTarball_get_dir,poppler)/poppler \
-	-I$(call gb_UnpackedTarball_get_dir,poppler)/goo \
+	-I$(gb_UnpackedTarball_workdir)/poppler \
+	-I$(gb_UnpackedTarball_workdir)/poppler/poppler \
+	-I$(gb_UnpackedTarball_workdir)/poppler/goo \
 	$$(INCLUDE) \
 )
 
@@ -2894,9 +2894,9 @@ else # !SYSTEM_CLUCENE
 
 define gb_LinkTarget__use_clucene
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,clucene)/src/core \
-	-I$(call gb_UnpackedTarball_get_dir,clucene)/src/shared \
-	-I$(call gb_UnpackedTarball_get_dir,clucene)/src/contribs-lib \
+	-I$(gb_UnpackedTarball_workdir)/clucene/src/core \
+	-I$(gb_UnpackedTarball_workdir)/clucene/src/shared \
+	-I$(gb_UnpackedTarball_workdir)/clucene/src/contribs-lib \
 	$$(INCLUDE) \
 )
 
@@ -2961,13 +2961,13 @@ else # !SYSTEM_OPENLDAP
 define gb_LinkTarget__use_openldap
 $(call gb_LinkTarget_use_unpacked,$(1),openldap)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,openldap/include) \
+	-I$(gb_UnpackedTarball_workdir)/openldap/include \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_use_external_project,$(1),openldap,full)
 $(call gb_LinkTarget_add_libs,$(1), \
-	$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap/.libs/libldap.a \
-	$(call gb_UnpackedTarball_get_dir,openldap)/libraries/liblber/.libs/liblber.a \
+	$(gb_UnpackedTarball_workdir)/openldap/libraries/libldap/.libs/libldap.a \
+	$(gb_UnpackedTarball_workdir)/openldap/libraries/liblber/.libs/liblber.a \
 )
 
 endef
@@ -2998,7 +2998,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libtommath)/libtommath$(gb_StaticLibrary_PLAINEXT) \
+	$(gb_UnpackedTarball_workdir)/libtommath/libtommath$(gb_StaticLibrary_PLAINEXT) \
 )
 $(call gb_LinkTarget_use_external_project,$(1),libtommath)
 
@@ -3036,16 +3036,16 @@ $(eval $(call gb_Helper_register_packages_for_install,firebirdsdbc,\
 define gb_LinkTarget__use_libfbembed
 $(call gb_LinkTarget_use_package,$(1),firebird)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,firebird)/gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/include \
+	-I$(gb_UnpackedTarball_workdir)/firebird/gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/include \
 	$$(INCLUDE) \
 )
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,firebird)/gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/bin/ifbclient.lib \
+	$(gb_UnpackedTarball_workdir)/firebird/gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/bin/ifbclient.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,firebird)/gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/lib -lfbclient \
+	-L$(gb_UnpackedTarball_workdir)/firebird/gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/lib -lfbclient \
 )
 endif
 
@@ -3098,23 +3098,23 @@ define gb_LinkTarget__use_postgresql
 $(call gb_LinkTarget_use_external_project,$(1),postgresql,full)
 
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,postgresql)/src/include \
-	-I$(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq \
+	-I$(gb_UnpackedTarball_workdir)/postgresql/src/include \
+	-I$(gb_UnpackedTarball_workdir)/postgresql/src/interfaces/libpq \
 	$$(INCLUDE) \
 )
 
 ifeq ($(OS),WNT)
 
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,postgresql)/$(gb_MSBUILD_CONFIG)/libpq/libpq.lib \
+	$(gb_UnpackedTarball_workdir)/postgresql/$(gb_MSBUILD_CONFIG)/libpq/libpq.lib \
 )
 
 else # !WNT
 
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \
-	$(call gb_UnpackedTarball_get_dir,postgresql)/src/common/libpgcommon$(gb_StaticLibrary_PLAINEXT) \
-	$(call gb_UnpackedTarball_get_dir,postgresql)/src/port/libpgport$(gb_StaticLibrary_PLAINEXT) \
+	$(gb_UnpackedTarball_workdir)/postgresql/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \
+	$(gb_UnpackedTarball_workdir)/postgresql/src/common/libpgcommon$(gb_StaticLibrary_PLAINEXT) \
+	$(gb_UnpackedTarball_workdir)/postgresql/src/port/libpgport$(gb_StaticLibrary_PLAINEXT) \
     $(if $(WITH_GSSAPI),$(GSSAPI_LIBS)) \
 )
 
@@ -3264,9 +3264,9 @@ $(eval $(call gb_Helper_register_packages_for_install,python,\
 define gb_LinkTarget__use_python_headers
 $(call gb_LinkTarget_use_external_project,$(1),python3,full)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,python3) \
-	-I$(call gb_UnpackedTarball_get_dir,python3)/PC \
-	-I$(call gb_UnpackedTarball_get_dir,python3)/Include \
+	-I$(gb_UnpackedTarball_workdir)/python3 \
+	-I$(gb_UnpackedTarball_workdir)/python3/PC \
+	-I$(gb_UnpackedTarball_workdir)/python3/Include \
 	$$(INCLUDE) \
 )
 
@@ -3289,15 +3289,15 @@ else
 python_arch_subdir=win32/
 endif
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,python3)/PCbuild/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \
+	$(gb_UnpackedTarball_workdir)/python3/PCbuild/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \
 )
 else ifeq ($(OS),MACOSX)
 $(call gb_LinkTarget_add_libs,$(1),\
-	-F$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO -framework LibreOfficePython \
+	-F$(gb_UnpackedTarball_workdir)/python3/python-inst/@__________________________________________________OOO -framework LibreOfficePython \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,python3) \
+	-L$(gb_UnpackedTarball_workdir)/python3 \
 	-lpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(if $(ENABLE_DBGUTIL),d) \
 )
 endif
@@ -3338,7 +3338,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
 
 define gb_LinkTarget__use_orcus
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
+	-I$(gb_UnpackedTarball_workdir)/liborcus/include \
 	$$(INCLUDE) \
 )
 
@@ -3350,7 +3350,7 @@ endef
 
 define gb_LinkTarget__use_orcus-parser
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
+	-I$(gb_UnpackedTarball_workdir)/liborcus/include \
 	$$(INCLUDE) \
 )
 
@@ -3370,12 +3370,12 @@ define gb_LinkTarget__use_orcus
 $(call gb_LinkTarget_use_package,$(1),liborcus)
 
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
+	-I$(gb_UnpackedTarball_workdir)/liborcus/include \
 	$$(INCLUDE) \
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-       -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.18 \
+       -L$(gb_UnpackedTarball_workdir)/liborcus/src/liborcus/.libs -lorcus-0.18 \
 )
 
 $(if $(SYSTEM_BOOST), \
@@ -3389,12 +3389,12 @@ define gb_LinkTarget__use_orcus-parser
 $(call gb_LinkTarget_use_package,$(1),liborcus)
 
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
+	-I$(gb_UnpackedTarball_workdir)/liborcus/include \
 	$$(INCLUDE) \
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.18 \
+	-L$(gb_UnpackedTarball_workdir)/liborcus/src/parser/.libs -lorcus-parser-0.18 \
 )
 
 endef
@@ -3422,11 +3422,11 @@ else # !SYSTEM_LIBEOT
 
 define gb_LinkTarget__use_libeot
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,libeot)/inc \
+	-I$(gb_UnpackedTarball_workdir)/libeot/inc \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libeot)/.libs/libeot$(gb_StaticLibrary_PLAINEXT) \
+	$(gb_UnpackedTarball_workdir)/libeot/.libs/libeot$(gb_StaticLibrary_PLAINEXT) \
 )
 $(call gb_LinkTarget_use_external_project,$(1),libeot)
 
@@ -3521,19 +3521,19 @@ define gb_LinkTarget__use_nss3
 $(call gb_LinkTarget_use_package,$(1),nss)
 $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
-	-I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss \
-	-I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include \
+	-I$(gb_UnpackedTarball_workdir)/nss/dist/public/nss \
+	-I$(gb_UnpackedTarball_workdir)/nss/dist/out/include \
 )
 
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/nspr4.lib \
-	$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/nss3.lib \
-	$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/smime3.lib \
+	$(gb_UnpackedTarball_workdir)/nss/dist/out/lib/nspr4.lib \
+	$(gb_UnpackedTarball_workdir)/nss/dist/out/lib/nss3.lib \
+	$(gb_UnpackedTarball_workdir)/nss/dist/out/lib/smime3.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib \
+	-L$(gb_UnpackedTarball_workdir)/nss/dist/out/lib \
 	-lnspr4 \
 	-lnss3 \
 	-lsmime3 \
@@ -3546,11 +3546,11 @@ define gb_LinkTarget__use_plc4
 $(call gb_LinkTarget_use_package,$(1),nss)
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/plc4.lib \
+	$(gb_UnpackedTarball_workdir)/nss/dist/out/lib/plc4.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-    -L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib -lplc4 \
+    -L$(gb_UnpackedTarball_workdir)/nss/dist/out/lib -lplc4 \
 )
 endif
 
@@ -3560,11 +3560,11 @@ define gb_LinkTarget__use_ssl3
 $(call gb_LinkTarget_use_package,$(1),nss)
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/ssl3.lib \
+	$(gb_UnpackedTarball_workdir)/nss/dist/out/lib/ssl3.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib -lssl3 \
+	-L$(gb_UnpackedTarball_workdir)/nss/dist/out/lib -lssl3 \
 )
 endif
 
@@ -3574,17 +3574,17 @@ define gb_LinkTarget__use_nssutil3
 $(call gb_LinkTarget_use_package,$(1),nss)
 $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
-	-I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss \
-	-I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include \
+	-I$(gb_UnpackedTarball_workdir)/nss/dist/public/nss \
+	-I$(gb_UnpackedTarball_workdir)/nss/dist/out/include \
 )
 
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/nssutil3.lib \
+	$(gb_UnpackedTarball_workdir)/nss/dist/out/lib/nssutil3.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib \
+	-L$(gb_UnpackedTarball_workdir)/nss/dist/out/lib \
 	-lnssutil3 \
 )
 endif
@@ -3602,7 +3602,7 @@ ifeq ($(ENABLE_BREAKPAD),TRUE)
 
 define gb_LinkTarget__use_breakpad
 $(call gb_LinkTarget_set_include,$(1),\
-    -I$(call gb_UnpackedTarball_get_dir,breakpad)/src \
+    -I$(gb_UnpackedTarball_workdir)/breakpad/src \
     $$(INCLUDE) \
 )
 
@@ -3612,7 +3612,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,breakpad)/src/client/linux/libbreakpad_client.a \
+	$(gb_UnpackedTarball_workdir)/breakpad/src/client/linux/libbreakpad_client.a \
 )
 endif
 
@@ -3667,7 +3667,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-       -LIBPATH:$(call gb_UnpackedTarball_get_dir,libgpg-error)/src/.libs libgpg-error.lib \
+       -LIBPATH:$(gb_UnpackedTarball_workdir)/libgpg-error/src/.libs libgpg-error.lib \
 )
 
 endef
@@ -3680,15 +3680,15 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-       -LIBPATH:$(call gb_UnpackedTarball_get_dir,libassuan)/src/.libs libassuan.lib \
+       -LIBPATH:$(gb_UnpackedTarball_workdir)/libassuan/src/.libs libassuan.lib \
 )
 
 endef
 
 define gb_LinkTarget__use_gpgmepp
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src \
-	-I$(call gb_UnpackedTarball_get_dir,gpgmepp)/src \
+	-I$(gb_UnpackedTarball_workdir)/gpgmepp/lang/cpp/src \
+	-I$(gb_UnpackedTarball_workdir)/gpgmepp/src \
 	$$(GPG_ERROR_CFLAGS) \
 	$$(INCLUDE) \
 )
@@ -3716,14 +3716,14 @@ define gb_LinkTarget__use_gpgmepp
 $(call gb_LinkTarget_use_package,$(1),gpgmepp)
 
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src \
-	-I$(call gb_UnpackedTarball_get_dir,gpgmepp)/src \
+	-I$(gb_UnpackedTarball_workdir)/gpgmepp/lang/cpp/src \
+	-I$(gb_UnpackedTarball_workdir)/gpgmepp/src \
 	$$(GPG_ERROR_CFLAGS) \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src/.libs/ -lgpgmepp \
-	$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-L$(call gb_UnpackedTarball_get_dir,gpgmepp)/src/.libs/ -lgpgme) \
+	-L$(gb_UnpackedTarball_workdir)/gpgmepp/lang/cpp/src/.libs/ -lgpgmepp \
+	$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-L$(gb_UnpackedTarball_workdir)/gpgmepp/src/.libs/ -lgpgme) \
 	$(if $(filter TRUE,$(DISABLE_DYNLOADING)),$$(GPG_ERROR_LIBS)) \
 	$(if $(filter TRUE,$(DISABLE_DYNLOADING)),$$(LIBASSUAN_LIBS)) \
 )
@@ -4093,7 +4093,7 @@ ifeq ($(OS),MACOSX)
 # use set_external, to avoid having the command added as prerequisite for the
 # targets that make use of it. (Otherwise make will choke as it doesn't have a
 # matching rule to build that specific file)
-$(call gb_ExternalExecutable_set_external,python,$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR))
+$(call gb_ExternalExecutable_set_external,python,$(gb_UnpackedTarball_workdir)/python3/python-inst/@__________________________________________________OOO/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR))
 # the Zip ensures that internal python has been built (cannot use the Package
 # target, as that is not used on Mac)
 $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_GeneratedPackage_get_target_for_build,python3))
@@ -4197,17 +4197,17 @@ else # !SYSTEM_BZIP2
 
 define gb_LinkTarget__use_bzip2
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,bzip2) \
+	-I$(gb_UnpackedTarball_workdir)/bzip2 \
 	$$(INCLUDE) \
 )
 
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,bzip2)/libbz2.lib \
+	$(gb_UnpackedTarball_workdir)/bzip2/libbz2.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,bzip2) -lbz2 \
+	-L$(gb_UnpackedTarball_workdir)/bzip2 -lbz2 \
 )
 endif
 
@@ -4231,7 +4231,7 @@ endef
 ifneq ($(ENABLE_PDFIUM),)
 define gb_LinkTarget__use_pdfium
 $(call gb_LinkTarget_set_include,$(1),\
-       -I$(call gb_UnpackedTarball_get_dir,pdfium)/public \
+       -I$(gb_UnpackedTarball_workdir)/pdfium/public \
        -DCOMPONENT_BUILD \
        $$(INCLUDE) \
 )
@@ -4256,7 +4256,7 @@ else
 define gb_LinkTarget__use_dragonbox
 $(call gb_LinkTarget_use_unpacked,$(1),dragonbox)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,dragonbox/include/)\
+	-I$(gb_UnpackedTarball_workdir)/dragonbox/include/\
 	$$(INCLUDE) \
 )
 endef
@@ -4266,7 +4266,7 @@ endif
 define gb_LinkTarget__use_dtoa
 $(call gb_LinkTarget_use_unpacked,$(1),dtoa)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,dtoa/include/)\
+	-I$(gb_UnpackedTarball_workdir)/dtoa/include/\
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_use_static_libraries,$(1),\
@@ -4303,7 +4303,7 @@ else # !SYSTEM_BOX2D
 define gb_LinkTarget__use_box2d
 $(call gb_LinkTarget_use_unpacked,$(1),box2d)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,box2d/include/)\
+	-I$(gb_UnpackedTarball_workdir)/box2d/include/\
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_use_static_libraries,$(1),\
@@ -4333,7 +4333,7 @@ else
 define gb_LinkTarget__use_zxcvbn-c
 $(call gb_LinkTarget_use_unpacked,$(1),zxcvbn-c)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,zxcvbn-c)\
+	-I$(gb_UnpackedTarball_workdir)/zxcvbn-c\
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_use_static_libraries,$(1),\
@@ -4364,7 +4364,7 @@ ifneq ($(ENABLE_ZXING),)
 define gb_LinkTarget__use_zxing
 $(call gb_LinkTarget_use_unpacked,$(1),zxing)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,zxing/core/src/)\
+	-I$(gb_UnpackedTarball_workdir)/zxing/core/src/\
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_use_static_libraries,$(1),\
@@ -4399,7 +4399,7 @@ else
 define gb_LinkTarget__use_frozen
 $(call gb_LinkTarget_use_unpacked,$(1),frozen)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,frozen/include/)\
+	-I$(gb_UnpackedTarball_workdir)/frozen/include/\
 	$$(INCLUDE) \
 )
 endef
diff --git a/external/IAccessible2/ExternalProject_IAccessible2.mk b/external/IAccessible2/ExternalProject_IAccessible2.mk
index 0ef6c8fc6014..6c4d727c7caf 100644
--- a/external/IAccessible2/ExternalProject_IAccessible2.mk
+++ b/external/IAccessible2/ExternalProject_IAccessible2.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,IAccessible2,\
 $(call gb_ExternalProject_get_state_target,IAccessible2,build) :
 	$(call gb_Trace_StartRange,IAccessible2,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
-		cd $(call gb_UnpackedTarball_get_dir,IAccessible2)\
+		cd $(gb_UnpackedTarball_workdir)/IAccessible2\
 		&& ./concatidl.sh\
 	)
 	$(call gb_Trace_EndRange,IAccessible2,EXTERNAL)
diff --git a/external/argon2/ExternalProject_argon2.mk b/external/argon2/ExternalProject_argon2.mk
index 7e521096af22..80d6b0596852 100644
--- a/external/argon2/ExternalProject_argon2.mk
+++ b/external/argon2/ExternalProject_argon2.mk
@@ -22,12 +22,12 @@ $(call gb_ExternalProject_get_state_target,argon2,build):
 	$(call gb_Trace_StartRange,argon2,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		MSBuild.exe vs2015/Argon2OptDll/Argon2OptDll.vcxproj \
-			/p:SolutionDir="$(call gb_UnpackedTarball_get_dir,argon2)/" \
+			/p:SolutionDir="$(gb_UnpackedTarball_workdir)/argon2/" \
 			$(gb_MSBUILD_CONFIG_AND_PLATFORM) \
 			/p:PlatformToolset=$(VCTOOLSET) /p:VisualStudioVersion=$(VCVER) /ToolsVersion:Current \
 			$(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
 		&& MSBuild.exe vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj \
-			/p:SolutionDir="$(call gb_UnpackedTarball_get_dir,argon2)/" \
+			/p:SolutionDir="$(gb_UnpackedTarball_workdir)/argon2/" \
 			$(gb_MSBUILD_CONFIG_AND_PLATFORM) \
 			/p:PlatformToolset=$(VCTOOLSET) /p:VisualStudioVersion=$(VCVER) /ToolsVersion:Current \
 			$(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
diff --git a/external/boost/StaticLibrary_boost_locale.mk b/external/boost/StaticLibrary_boost_locale.mk
index 1193867a6d0e..0b9e03dcf09d 100644
--- a/external/boost/StaticLibrary_boost_locale.mk
+++ b/external/boost/StaticLibrary_boost_locale.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_StaticLibrary_add_defs,boost_locale,\
 ))
 
 $(eval $(call gb_StaticLibrary_set_include,boost_locale, \
-    -I$(call gb_UnpackedTarball_get_dir,boost)/libs/locale/src \
+    -I$(gb_UnpackedTarball_workdir)/boost/libs/locale/src \
     $$(INCLUDE) \
 ))
 
diff --git a/external/box2d/StaticLibrary_box2d.mk b/external/box2d/StaticLibrary_box2d.mk
index 1dfb6f25288f..ac16db04e176 100644
--- a/external/box2d/StaticLibrary_box2d.mk
+++ b/external/box2d/StaticLibrary_box2d.mk
@@ -16,8 +16,8 @@ $(eval $(call gb_StaticLibrary_set_warnings_disabled,box2d))
 $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,box2d,cpp))
 
 $(eval $(call gb_StaticLibrary_set_include,box2d,\
-    -I$(call gb_UnpackedTarball_get_dir,box2d/include/)\
-    -I$(call gb_UnpackedTarball_get_dir,box2d/src/)\
+    -I$(gb_UnpackedTarball_workdir)/box2d/include/\
+    -I$(gb_UnpackedTarball_workdir)/box2d/src/\
     $$(INCLUDE)\
 ))
 
diff --git a/external/breakpad/StaticLibrary_breakpad.mk b/external/breakpad/StaticLibrary_breakpad.mk
index fc5d3251f5bd..f5fc88a750d9 100644
--- a/external/breakpad/StaticLibrary_breakpad.mk
+++ b/external/breakpad/StaticLibrary_breakpad.mk
@@ -14,8 +14,8 @@ $(eval $(call gb_StaticLibrary_set_warnings_disabled,breakpad))
 $(eval $(call gb_StaticLibrary_use_unpacked,breakpad,breakpad))
 
 $(eval $(call gb_StaticLibrary_set_include,breakpad,\
-    -I$(call gb_UnpackedTarball_get_dir,breakpad)/src \
-    -I$(call gb_UnpackedTarball_get_dir,breakpad)/src/client/windows \
+    -I$(gb_UnpackedTarball_workdir)/breakpad/src \
+    -I$(gb_UnpackedTarball_workdir)/breakpad/src/client/windows \
     $$(INCLUDE) \
 ))
 
diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk
index df6bd5a37b78..40e249b51a2c 100644
--- a/external/cairo/ExternalProject_cairo.mk
+++ b/external/cairo/ExternalProject_cairo.mk
@@ -57,8 +57,8 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
 		$(if $(filter ANDROID iOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \
 		LIBS="$(ZLIB_LIBS)" \
 		$(if $(filter -fsanitize=%,$(LDFLAGS)),LDFLAGS="$(LDFLAGS) -fuse-ld=bfd") \
-		pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman -pthread" \
-		pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1 \
+		pixman_CFLAGS="-I$(gb_UnpackedTarball_workdir)/pixman/pixman -pthread" \
+		pixman_LIBS="-L$(gb_UnpackedTarball_workdir)/pixman/pixman/.libs -lpixman-1 \
 			$(if $(filter LINUX,$(OS)),-Wl$(COMMA)-z$(COMMA)origin \
 					-Wl$(COMMA)-rpath$(COMMA)\\\$$\$$ORIGIN) \
 			$(if $(filter -fsanitize=%,$(CC)), \
@@ -66,8 +66,8 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
 			        -Wc$(COMMA)-rtlib=compiler-rt))" \
 		png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \
 		png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \
-		$(if $(SYSTEM_FREETYPE),,FREETYPE_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,freetype)/include") \
-		$(if $(SYSTEM_FONTCONFIG),,FONTCONFIG_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,fontconfig)") \
+		$(if $(SYSTEM_FREETYPE),,FREETYPE_CFLAGS="-I$(gb_UnpackedTarball_workdir)/freetype/include") \
+		$(if $(SYSTEM_FONTCONFIG),,FONTCONFIG_CFLAGS="-I$(gb_UnpackedTarball_workdir)/fontconfig") \
 		$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 		$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
 		$(if $(filter EMSCRIPTEN ANDROID iOS,$(OS)),--disable-xlib --disable-xcb,$(if $(filter TRUE,$(DISABLE_GUI)),--disable-xlib --disable-xcb,--enable-xlib --enable-xcb)) \
diff --git a/external/clucene/Library_clucene.mk b/external/clucene/Library_clucene.mk
index e837f9f64fb6..6a31ce88addd 100644
--- a/external/clucene/Library_clucene.mk
+++ b/external/clucene/Library_clucene.mk
@@ -16,10 +16,10 @@ $(eval $(call gb_Library_use_unpacked,clucene,clucene))
 $(eval $(call gb_Library_set_warnings_disabled,clucene))
 
 $(eval $(call gb_Library_set_include,clucene,\
-	-I$(call gb_UnpackedTarball_get_dir,clucene)/inc/internal \
-	-I$(call gb_UnpackedTarball_get_dir,clucene)/src/core \
-	-I$(call gb_UnpackedTarball_get_dir,clucene)/src/contribs-lib \
-	-I$(call gb_UnpackedTarball_get_dir,clucene)/src/shared \
+	-I$(gb_UnpackedTarball_workdir)/clucene/inc/internal \
+	-I$(gb_UnpackedTarball_workdir)/clucene/src/core \
+	-I$(gb_UnpackedTarball_workdir)/clucene/src/contribs-lib \
+	-I$(gb_UnpackedTarball_workdir)/clucene/src/shared \
 	$$(INCLUDE) \
 ))
 
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index c63a8e0465ce..b999c5ceeb77 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -51,7 +51,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
 			--disable-tftp  \
 			$(if $(filter iOS MACOSX,$(OS)),\
 				--with-secure-transport,\
-				$(if $(ENABLE_OPENSSL),--with-openssl$(if $(SYSTEM_OPENSSL),,="$(call gb_UnpackedTarball_get_dir,openssl)"))) \
+				$(if $(ENABLE_OPENSSL),--with-openssl$(if $(SYSTEM_OPENSSL),,="$(gb_UnpackedTarball_workdir)/openssl"))) \
 			$(if $(filter LINUX,$(OS)),--without-ca-bundle --without-ca-path) \
 			$(gb_CONFIGURE_PLATFORMS) \
 			$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
diff --git a/external/dtoa/StaticLibrary_dtoa.mk b/external/dtoa/StaticLibrary_dtoa.mk
index 09f4231a200d..b309da0a0378 100644
--- a/external/dtoa/StaticLibrary_dtoa.mk
+++ b/external/dtoa/StaticLibrary_dtoa.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_StaticLibrary_add_defs,dtoa,\
 $(eval $(call gb_StaticLibrary_set_warnings_disabled,dtoa))
 
 $(eval $(call gb_StaticLibrary_set_include,dtoa,\
-    -I$(call gb_UnpackedTarball_get_dir,dtoa/src/)\
+    -I$(gb_UnpackedTarball_workdir)/dtoa/src/\
     $$(INCLUDE)\
 ))
 
diff --git a/external/epoxy/Library_epoxy.mk b/external/epoxy/Library_epoxy.mk
index 81c35d695997..2c89f5ad31e0 100644
--- a/external/epoxy/Library_epoxy.mk
+++ b/external/epoxy/Library_epoxy.mk
@@ -14,8 +14,8 @@ $(eval $(call gb_Library_use_unpacked,epoxy,epoxy))
 $(eval $(call gb_Library_set_warnings_disabled,epoxy))
 
 $(eval $(call gb_Library_set_include,epoxy,\
-	-I$(call gb_UnpackedTarball_get_dir,epoxy)/include \
-	-I$(call gb_UnpackedTarball_get_dir,epoxy)/src \
+	-I$(gb_UnpackedTarball_workdir)/epoxy/include \
+	-I$(gb_UnpackedTarball_workdir)/epoxy/src \
 	$$(INCLUDE) \
 ))
 
diff --git a/external/expat/StaticLibrary_expat.mk b/external/expat/StaticLibrary_expat.mk
index 025ab617ad15..f088b4b5d49e 100644
--- a/external/expat/StaticLibrary_expat.mk
+++ b/external/expat/StaticLibrary_expat.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_StaticLibrary_use_external_project,expat,expat,full))
 endif
 
 $(eval $(call gb_StaticLibrary_set_include,expat,\
-    -I$(call gb_UnpackedTarball_get_dir,expat) \
+    -I$(gb_UnpackedTarball_workdir)/expat \
     $$(INCLUDE) \
 ))
 
diff --git a/external/expat/StaticLibrary_expat_x64.mk b/external/expat/StaticLibrary_expat_x64.mk
index 68bb7f86a89b..97b009d87aed 100644
--- a/external/expat/StaticLibrary_expat_x64.mk
+++ b/external/expat/StaticLibrary_expat_x64.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_StaticLibrary_set_warnings_disabled,expat_x64))
 $(eval $(call gb_StaticLibrary_use_unpacked,expat_x64,expat))
 
 $(eval $(call gb_StaticLibrary_set_include,expat_x64,\
-    -I$(call gb_UnpackedTarball_get_dir,expat) \
+    -I$(gb_UnpackedTarball_workdir)/expat \
     $$(INCLUDE) \
 ))
 
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
index 18ee97eb4409..16fe160a3af6 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -32,15 +32,15 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
 		&& export CPPFLAGS=" \
 			$(BOOST_CPPFLAGS) \
 			$(if $(SYSTEM_LIBATOMIC_OPS),$(LIBATOMIC_OPS_CFLAGS), \
-				-I$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src \
+				-I$(gb_UnpackedTarball_workdir)/libatomic_ops/src \
 			) \
 			$(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_CFLAGS), \
-				-I$(call gb_UnpackedTarball_get_dir,libtommath) \
+				-I$(gb_UnpackedTarball_workdir)/libtommath \
 			) \
 			$(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \
-				-I$(call gb_UnpackedTarball_get_dir,icu)/source \
-				-I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
-				-I$(call gb_UnpackedTarball_get_dir,icu)/source/common \
+				-I$(gb_UnpackedTarball_workdir)/icu/source \
+				-I$(gb_UnpackedTarball_workdir)/icu/source/i18n \
+				-I$(gb_UnpackedTarball_workdir)/icu/source/common \
 			) \
 			$(if $(filter GCC-INTEL,$(COM)-$(CPUNAME)),-Di386=1) \
 			" \
@@ -64,16 +64,16 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
 		&& export LDFLAGS=" \
 			$(call gb_ExternalProject_get_link_flags,firebird) \
 			$(if $(SYSTEM_LIBATOMIC_OPS),$(LIBATOMIC_OPS_LIBS), \
-				-L$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src \
+				-L$(gb_UnpackedTarball_workdir)/libatomic_ops/src \
 			) \
 			$(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_LIBS), \
-				-L$(call gb_UnpackedTarball_get_dir,libtommath) \
+				-L$(gb_UnpackedTarball_workdir)/libtommath \
 			) \
 			$(if $(SYSTEM_ICU),$(ICU_LIBS), \
-				-L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \
+				-L$(gb_UnpackedTarball_workdir)/icu/source/lib \
 			) \
 		" \
-		&& export LIBREOFFICE_ICU_LIB="$(call gb_UnpackedTarball_get_dir,icu)/source/lib" \
+		&& export LIBREOFFICE_ICU_LIB="$(gb_UnpackedTarball_workdir)/icu/source/lib" \
 		&& export MSVC_USE_INDIVIDUAL_PDBS=TRUE \
 		&& MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure \
 			--without-editline \
@@ -87,8 +87,8 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
 			$(if $(HAVE_LIBCPP),CXX='$(CXX) -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR') \
 		&& LC_ALL=C $(MAKE) \
 			$(if $(ENABLE_DEBUG),Debug) SHELL='$(SHELL)' $(if $(filter LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS") \
-			MATHLIB="$(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_LIBS),-L$(call gb_UnpackedTarball_get_dir,libtommath) -ltommath)" \
-			LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst $$,$$$$,$(call gb_Helper_extend_ld_path,$(call gb_UnpackedTarball_get_dir,icu)/source/lib)))' \
+			MATHLIB="$(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_LIBS),-L$(gb_UnpackedTarball_workdir)/libtommath -ltommath)" \
+			LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst $$,$$$$,$(call gb_Helper_extend_ld_path,$(gb_UnpackedTarball_workdir)/icu/source/lib)))' \
 		$(if $(filter MACOSX,$(OS)), \
 			&& install_name_tool -id @__________________________________________________OOO/libfbclient.dylib.$(firebird_VERSION) \
 				-delete_rpath @loader_path/.. \
diff --git a/external/fontconfig/ExternalProject_fontconfig.mk b/external/fontconfig/ExternalProject_fontconfig.mk
index ee0301b251db..0d899ef129bd 100644
--- a/external/fontconfig/ExternalProject_fontconfig.mk
+++ b/external/fontconfig/ExternalProject_fontconfig.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
 			--disable-silent-rules \
 			--with-pic \
 			$(if $(filter ANDROID,$(OS)),--with-arch=arm) \
-			--with-expat-includes=$(call gb_UnpackedTarball_get_dir,expat)/lib \
+			--with-expat-includes=$(gb_UnpackedTarball_workdir)/expat/lib \
 			--with-expat-lib=$(gb_StaticLibrary_WORKDIR) \
 			$(gb_CONFIGURE_PLATFORMS) \
 			$(if $(filter ANDROID,$(OS)), \
diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk
index d3d65612200c..548470d6a94b 100644
--- a/external/freetype/ExternalProject_freetype.mk
+++ b/external/freetype/ExternalProject_freetype.mk
@@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) :
 			--without-bzip2 \
 			--without-harfbuzz \
 			--without-png \
-			--prefix=$(call gb_UnpackedTarball_get_dir,freetype/instdir) \
+			--prefix=$(gb_UnpackedTarball_workdir)/freetype/instdir \
 			$(gb_CONFIGURE_PLATFORMS) \
 			$(if $(filter -fsanitize=undefined,$(CC)),CC='$(CC) -fno-sanitize=function') \
 			CFLAGS="$(CFLAGS) \
diff --git a/external/gpgmepp/Library_gpgmepp.mk b/external/gpgmepp/Library_gpgmepp.mk
index 8191e55d4709..e9a677c2d0eb 100644
--- a/external/gpgmepp/Library_gpgmepp.mk
+++ b/external/gpgmepp/Library_gpgmepp.mk
@@ -22,18 +22,18 @@ $(eval $(call gb_LinkTarget_use_external_project,\
 $(eval $(call gb_Library_set_warnings_disabled,gpgmepp))
 
 $(eval $(call gb_Library_set_include,gpgmepp,\
-    -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src \
-    -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src/interfaces \
-    -I$(call gb_UnpackedTarball_get_dir,gpgmepp) \
-    -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/src \
-    -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/conf \
-    -I$(call gb_UnpackedTarball_get_dir,libgpg-error)/src \
+    -I$(gb_UnpackedTarball_workdir)/gpgmepp/lang/cpp/src \
+    -I$(gb_UnpackedTarball_workdir)/gpgmepp/lang/cpp/src/interfaces \
+    -I$(gb_UnpackedTarball_workdir)/gpgmepp \
+    -I$(gb_UnpackedTarball_workdir)/gpgmepp/src \
+    -I$(gb_UnpackedTarball_workdir)/gpgmepp/conf \
+    -I$(gb_UnpackedTarball_workdir)/libgpg-error/src \
     $$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_libs,gpgmepp,\
        ws2_32.lib shell32.lib \
-       -LIBPATH:$(call gb_UnpackedTarball_get_dir,gpgmepp)/src/.libs libgpgme.lib \
+       -LIBPATH:$(gb_UnpackedTarball_workdir)/gpgmepp/src/.libs libgpgme.lib \
 ))
 
 $(eval $(call gb_Library_add_defs,gpgmepp,\
diff --git a/external/graphite/StaticLibrary_graphite.mk b/external/graphite/StaticLibrary_graphite.mk
index ee233a10b028..a44066cc841e 100644
--- a/external/graphite/StaticLibrary_graphite.mk
+++ b/external/graphite/StaticLibrary_graphite.mk
@@ -14,8 +14,8 @@ $(eval $(call gb_StaticLibrary_use_unpacked,graphite,graphite))
 $(eval $(call gb_StaticLibrary_set_warnings_disabled,graphite))
 
 $(eval $(call gb_StaticLibrary_set_include,graphite,\
-	-I$(call gb_UnpackedTarball_get_dir,graphite/include) \
-	-I$(call gb_UnpackedTarball_get_dir,graphite/src) \
+	-I$(gb_UnpackedTarball_workdir)/graphite/include \
+	-I$(gb_UnpackedTarball_workdir)/graphite/src \
 	$$(INCLUDE) \
 ))
 
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk
index 9c8dd804e8f0..633d3658ce86 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
 			--with-graphite2=yes \
 			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			$(if $(gb_FULLDEPS),,--disable-dependency-tracking) \
-			--libdir=$(call gb_UnpackedTarball_get_dir,harfbuzz/src/.libs) \
+			--libdir=$(gb_UnpackedTarball_workdir)/harfbuzz/src/.libs \
 			$(gb_CONFIGURE_PLATFORMS) \
 			CXXFLAGS=' \
 				$(if $(filter ANDROID,$(OS)),-DHB_NO_MMAP=1,) \
diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
index a41206b506f0..fa90262e0d05 100644
--- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
@@ -25,12 +25,12 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) :
 			$(if $(verbose),-v,-q) \
 			-f build.xml \
 			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-			-Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \
-			-Dlibformula.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar \
-			-Dliblayout.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_liblayout)/build/lib/liblayout.jar \
-			-Dlibloader.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libloader)/dist/libloader-$(LIBLOADER_VERSION).jar \
-			-Dlibserializer.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libserializer)/dist/libserializer-$(LIBBASE_VERSION).jar \
-			-Dlibxml.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libxml)/dist/libxml-$(LIBXML_VERSION).jar \
+			-Dlibbase.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libbase/dist/libbase-$(LIBBASE_VERSION).jar \
+			-Dlibformula.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libformula/dist/libformula-$(LIBFORMULA_VERSION).jar \
+			-Dliblayout.jar=$(gb_UnpackedTarball_workdir)/jfreereport_liblayout/build/lib/liblayout.jar \
+			-Dlibloader.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libloader/dist/libloader-$(LIBLOADER_VERSION).jar \
+			-Dlibserializer.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libserializer/dist/libserializer-$(LIBBASE_VERSION).jar \
+			-Dlibxml.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libxml/dist/libxml-$(LIBXML_VERSION).jar \
 			-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
 			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 			$(if $(debug),-Dbuild.debug="on") jar \
diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
index 0ea331570b77..8fc997806c4f 100644
--- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
@@ -33,15 +33,15 @@ $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) :
 			$(if $(verbose),-v,-q) \
 			-f build.xml \
 			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-			-Dflute.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_flute)/dist/flute-$(FLUTE_VERSION).jar \
-			-Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \
-			-Dlibformula.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar \
-			-Dlibfonts.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libfonts)/dist/libfonts-$(LIBFONTS_VERSION).jar \
-			-Dlibloader.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libloader)/dist/libloader-$(LIBLOADER_VERSION).jar \
-			-Dlibrepository.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_librepository)/dist/librepository-$(LIBREPOSITORY_VERSION).jar \
-			-Dlibserializer.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libserializer)/dist/libserializer-$(LIBBASE_VERSION).jar \
-			-Dlibxml.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libxml)/dist/libxml-$(LIBXML_VERSION).jar \
-			-Dsac.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_sac)/build/lib/sac.jar \
+			-Dflute.jar=$(gb_UnpackedTarball_workdir)/jfreereport_flute/dist/flute-$(FLUTE_VERSION).jar \
+			-Dlibbase.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libbase/dist/libbase-$(LIBBASE_VERSION).jar \
+			-Dlibformula.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libformula/dist/libformula-$(LIBFORMULA_VERSION).jar \
+			-Dlibfonts.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libfonts/dist/libfonts-$(LIBFONTS_VERSION).jar \
+			-Dlibloader.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libloader/dist/libloader-$(LIBLOADER_VERSION).jar \
+			-Dlibrepository.jar=$(gb_UnpackedTarball_workdir)/jfreereport_librepository/dist/librepository-$(LIBREPOSITORY_VERSION).jar \
+			-Dlibserializer.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libserializer/dist/libserializer-$(LIBBASE_VERSION).jar \
+			-Dlibxml.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libxml/dist/libxml-$(LIBXML_VERSION).jar \
+			-Dsac.jar=$(gb_UnpackedTarball_workdir)/jfreereport_sac/build/lib/sac.jar \
 			-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
 			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 			-Dantcontrib.available="true" \
diff --git a/external/libcmis/StaticLibrary_libcmis.mk b/external/libcmis/StaticLibrary_libcmis.mk
index ebcd16607c59..1f1ea68c4db9 100644
--- a/external/libcmis/StaticLibrary_libcmis.mk
+++ b/external/libcmis/StaticLibrary_libcmis.mk
@@ -26,8 +26,8 @@ $(eval $(call gb_StaticLibrary_add_defs,libcmis, \
 ))
 
 $(eval $(call gb_StaticLibrary_set_include,libcmis, \
-    -I$(call gb_UnpackedTarball_get_dir,libcmis/inc) \
-    -I$(call gb_UnpackedTarball_get_dir,libcmis/src/libcmis) \
+    -I$(gb_UnpackedTarball_workdir)/libcmis/inc \
+    -I$(gb_UnpackedTarball_workdir)/libcmis/src/libcmis \
     $$(INCLUDE) \
 ))
 
diff --git a/external/libetonyek/Library_etonyek.mk b/external/libetonyek/Library_etonyek.mk
index 87e21fc4b78a..4c79ee7ac9d1 100644
--- a/external/libetonyek/Library_etonyek.mk
+++ b/external/libetonyek/Library_etonyek.mk
@@ -26,9 +26,9 @@ $(eval $(call gb_Library_set_warnings_disabled,etonyek))
 $(eval $(call gb_Library_set_precompiled_header,etonyek,external/libetonyek/inc/pch/precompiled_etonyek))
 
 $(eval $(call gb_Library_set_include,etonyek,\
-	-I$(call gb_UnpackedTarball_get_dir,libetonyek)/inc \
-	-I$(call gb_UnpackedTarball_get_dir,libetonyek)/src/lib \
-	-I$(call gb_UnpackedTarball_get_dir,libetonyek)/src/lib/contexts \
+	-I$(gb_UnpackedTarball_workdir)/libetonyek/inc \
+	-I$(gb_UnpackedTarball_workdir)/libetonyek/src/lib \
+	-I$(gb_UnpackedTarball_workdir)/libetonyek/src/lib/contexts \
 	$$(INCLUDE) \
 ))
 
diff --git a/external/libffi/ExternalProject_libffi.mk b/external/libffi/ExternalProject_libffi.mk
index 2e60dd480175..b93fcd8b33c1 100644
--- a/external/libffi/ExternalProject_libffi.mk
+++ b/external/libffi/ExternalProject_libffi.mk
@@ -37,13 +37,13 @@ $(call gb_ExternalProject_get_state_target,libffi,build):
 				--enable-portable-binary) \
 			$(if $(filter WNT,$(OS)), \
 			    --disable-static \
-			    CC="$(call gb_UnpackedTarball_get_dir,libffi)/msvcc.sh -m$(libffi_WIN_PLATFORM)" \
-			    CXX="$(call gb_UnpackedTarball_get_dir,libffi)/msvcc.sh -m$(libffi_WIN_PLATFORM)" \
+			    CC="$(gb_UnpackedTarball_workdir)/libffi/msvcc.sh -m$(libffi_WIN_PLATFORM)" \
+			    CXX="$(gb_UnpackedTarball_workdir)/libffi/msvcc.sh -m$(libffi_WIN_PLATFORM)" \
 				LD='link' \
 				CPP='cl -nologo -EP' \
 				CXXCPP='cl -nologo -EP' \
 				CPPFLAGS="-DFFI_BUILDING_DLL $(SOLARINC)") \
-			--prefix=$(call gb_UnpackedTarball_get_dir,libffi)/$(HOST_PLATFORM) \
+			--prefix=$(gb_UnpackedTarball_workdir)/libffi/$(HOST_PLATFORM) \
 			--disable-docs \
 		&& $(MAKE) \
 	)
diff --git a/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk b/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk
index ace14fd8fc5d..9acf49095d71 100644
--- a/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk
+++ b/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,libjpeg-turbo,libjpeg-turbo))
 $(eval $(call gb_StaticLibrary_set_warnings_disabled,libjpeg-turbo))
 
 $(eval $(call gb_StaticLibrary_set_include,libjpeg-turbo,\
-    -I$(call gb_UnpackedTarball_get_dir,libjpeg-turbo) \
+    -I$(gb_UnpackedTarball_workdir)/libjpeg-turbo \
     $$(INCLUDE) \
 ))
 
@@ -93,8 +93,8 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,libjpeg-turbo,\
 ifneq ($(NASM),)
 
 $(eval $(call gb_StaticLibrary_add_nasmflags,libjpeg-turbo,\
-	-I$(call gb_UnpackedTarball_get_dir,libjpeg-turbo)/simd/nasm/ \
-	-I$(dir $(call gb_UnpackedTarball_get_dir,libjpeg-turbo)/$(1)) \
+	-I$(gb_UnpackedTarball_workdir)/libjpeg-turbo/simd/nasm/ \
+	-I$(dir $(gb_UnpackedTarball_workdir)/libjpeg-turbo/$(1)) \
 ))
 
 ifeq ($(CPUNAME),X86_64)
diff --git a/external/liblangtag/ExternalProject_liblangtag.mk b/external/liblangtag/ExternalProject_liblangtag.mk
index 4e07b9fe4278..59748c935442 100644
--- a/external/liblangtag/ExternalProject_liblangtag.mk
+++ b/external/liblangtag/ExternalProject_liblangtag.mk
@@ -32,13 +32,13 @@ $(call gb_ExternalProject_get_state_target,liblangtag,build):
 		$(gb_CONFIGURE_PLATFORMS) \
 		$(if $(CROSS_COMPILING),$(if $(filter WNT,$(OS)),"lt_cv_c99_vsnprintf=yes" "ac_cv_va_copy=yes","ac_cv_va_copy=no")) \
 		LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \
-		LIBXML2_LIBS="$(if $(filter WNT,$(OS)),-L$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc -llibxml2,$(LIBXML_LIBS))" \
+		LIBXML2_LIBS="$(if $(filter WNT,$(OS)),-L$(gb_UnpackedTarball_workdir)/libxml2/win32/bin.msvc -llibxml2,$(LIBXML_LIBS))" \
 		$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________URELIB) \
 		$(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN) \
 		$(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN) \
 		&& $(if $(verbose),V=1) \
 		   $(MAKE) \
-                LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst $$,$$$$,$(call gb_Helper_extend_ld_path,$(call gb_UnpackedTarball_get_dir,liblangtag)/liblangtag/.libs)))' \
+                LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst $$,$$$$,$(call gb_Helper_extend_ld_path,$(gb_UnpackedTarball_workdir)/liblangtag/liblangtag/.libs)))' \
 		$(if $(filter MACOSX,$(OS)),\
 			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl URELIB \
 				$(EXTERNAL_WORKDIR)/liblangtag/.libs/liblangtag.1.dylib \
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index 58d433f9d093..30e71443f5a0 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_Library_set_warnings_disabled,mwaw))
 $(eval $(call gb_Library_set_precompiled_header,mwaw,external/libmwaw/inc/pch/precompiled_mwaw))
 
 $(eval $(call gb_Library_set_include,mwaw,\
-    -I$(call gb_UnpackedTarball_get_dir,libmwaw)/inc \
+    -I$(gb_UnpackedTarball_workdir)/libmwaw/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/external/libodfgen/Library_odfgen.mk b/external/libodfgen/Library_odfgen.mk
index b67f5ad89715..be9b36b86c4c 100644
--- a/external/libodfgen/Library_odfgen.mk
+++ b/external/libodfgen/Library_odfgen.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Library_use_externals,odfgen,\
 $(eval $(call gb_Library_set_warnings_disabled,odfgen))
 
 $(eval $(call gb_Library_set_include,odfgen,\
-    -I$(call gb_UnpackedTarball_get_dir,libodfgen)/inc \
+    -I$(gb_UnpackedTarball_workdir)/libodfgen/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk
index b7b459f36b7f..ef1393a998d1 100644
--- a/external/liborcus/Library_orcus-parser.mk
+++ b/external/liborcus/Library_orcus-parser.mk
@@ -24,8 +24,8 @@ $(eval $(call gb_Library_set_warnings_disabled,orcus-parser))
 $(eval $(call gb_Library_set_precompiled_header,orcus-parser,external/liborcus/inc/pch/precompiled_orcus-parser))
 
 $(eval $(call gb_Library_set_include,orcus-parser,\
-	-I$(call gb_UnpackedTarball_get_dir,liborcus)/include \
-	-I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \
+	-I$(gb_UnpackedTarball_workdir)/liborcus/include \
+	-I$(gb_UnpackedTarball_workdir)/liborcus/src/include \
 	$$(INCLUDE) \
 ))
 
diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk
index 28ef13612260..7a138e11d925 100644
--- a/external/liborcus/Library_orcus.mk
+++ b/external/liborcus/Library_orcus.mk
@@ -25,8 +25,8 @@ $(eval $(call gb_Library_set_warnings_disabled,orcus))
 $(eval $(call gb_Library_set_precompiled_header,orcus,external/liborcus/inc/pch/precompiled_orcus))
 
 $(eval $(call gb_Library_set_include,orcus,\
-	-I$(call gb_UnpackedTarball_get_dir,liborcus)/include \
-	-I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \
+	-I$(gb_UnpackedTarball_workdir)/liborcus/include \
+	-I$(gb_UnpackedTarball_workdir)/liborcus/src/include \
 	$$(INCLUDE) \
 ))
 
diff --git a/external/librevenge/Library_revenge.mk b/external/librevenge/Library_revenge.mk
index 4250e4e5778b..480fff04cd15 100644
--- a/external/librevenge/Library_revenge.mk
+++ b/external/librevenge/Library_revenge.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_Library_use_externals,revenge,\
 $(eval $(call gb_Library_set_warnings_disabled,revenge))
 
 $(eval $(call gb_Library_set_include,revenge,\
-    -I$(call gb_UnpackedTarball_get_dir,librevenge)/inc \
+    -I$(gb_UnpackedTarball_workdir)/librevenge/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/external/libstaroffice/Library_staroffice.mk b/external/libstaroffice/Library_staroffice.mk
index 66b35501d19a..bb90b7d9c726 100644
--- a/external/libstaroffice/Library_staroffice.mk
+++ b/external/libstaroffice/Library_staroffice.mk
@@ -20,8 +20,8 @@ $(eval $(call gb_Library_set_warnings_disabled,staroffice))
 $(eval $(call gb_Library_set_precompiled_header,staroffice,external/libstaroffice/inc/pch/precompiled_staroffice))
 
 $(eval $(call gb_Library_set_include,staroffice,\
-    -I$(call gb_UnpackedTarball_get_dir,libstaroffice)/inc \
-    -I$(call gb_UnpackedTarball_get_dir,libstaroffice)/src/lib \
+    -I$(gb_UnpackedTarball_workdir)/libstaroffice/inc \
+    -I$(gb_UnpackedTarball_workdir)/libstaroffice/src/lib \
     $$(INCLUDE) \
 ))
 
diff --git a/external/libtiff/ExternalProject_libtiff.mk b/external/libtiff/ExternalProject_libtiff.mk
index f6bcba106669..e4c98938d255 100644
--- a/external/libtiff/ExternalProject_libtiff.mk
+++ b/external/libtiff/ExternalProject_libtiff.mk
@@ -52,14 +52,14 @@ $(call gb_ExternalProject_get_state_target,libtiff,build) :
 			--without-x \
 			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			CFLAGS="$(CFLAGS) $(call gb_ExternalProject_get_build_flags,libtiff) $(gb_EMSCRIPTEN_CFLAGS)" \
-			$(if $(SYSTEM_ZLIB),,--with-zlib-include-dir="$(call gb_UnpackedTarball_get_dir,zlib)") \
+			$(if $(SYSTEM_ZLIB),,--with-zlib-include-dir="$(gb_UnpackedTarball_workdir)/zlib") \
 			$(if $(SYSTEM_ZLIB),,--with-zlib-lib-dir="$(gb_StaticLibrary_WORKDIR)") \
-			$(if $(SYSTEM_LIBJPEG),,--with-jpeg-include-dir="$(call gb_UnpackedTarball_get_dir,libjpeg-turbo)") \
+			$(if $(SYSTEM_LIBJPEG),,--with-jpeg-include-dir="$(gb_UnpackedTarball_workdir)/libjpeg-turbo") \
 			$(if $(SYSTEM_LIBJPEG),,--with-jpeg-lib-dir="$(gb_StaticLibrary_WORKDIR)") \
-			$(if $(SYSTEM_LIBWEBP),,--with-webp-include-dir="$(call gb_UnpackedTarball_get_dir,libwebp/src)") \
+			$(if $(SYSTEM_LIBWEBP),,--with-webp-include-dir="$(gb_UnpackedTarball_workdir)/libwebp/src") \
 			$(if $(SYSTEM_LIBWEBP),,$(if $(filter WNT,$(OS_FOR_BUILD)),\
-				--with-webp-lib-dir="$(call gb_UnpackedTarball_get_dir,libwebp)/output/lib/libwebp$(if $(MSVC_USE_DEBUG_RUNTIME),_debug)$(gb_StaticLibrary_PLAINEXT)", \
-				--with-webp-lib-dir="$(call gb_UnpackedTarball_get_dir,libwebp)/src/.libs")) \
+				--with-webp-lib-dir="$(gb_UnpackedTarball_workdir)/libwebp/output/lib/libwebp$(if $(MSVC_USE_DEBUG_RUNTIME),_debug)$(gb_StaticLibrary_PLAINEXT)", \
+				--with-webp-lib-dir="$(gb_UnpackedTarball_workdir)/libwebp/src/.libs")) \
 			CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS)" \
 			LDFLAGS="$(call gb_ExternalProject_get_link_flags,libtiff) $(gb_EMSCRIPTEN_LDFLAGS)" \
 			ac_cv_lib_z_inflateEnd=yes \
diff --git a/external/libwpd/Library_wpd.mk b/external/libwpd/Library_wpd.mk
index 6b14f424d988..b0437ed39751 100644
--- a/external/libwpd/Library_wpd.mk
+++ b/external/libwpd/Library_wpd.mk
@@ -19,8 +19,8 @@ $(eval $(call gb_Library_use_externals,wpd,\
 $(eval $(call gb_Library_set_warnings_disabled,wpd))
 
 $(eval $(call gb_Library_set_include,wpd,\
-    -I$(call gb_UnpackedTarball_get_dir,libwpd)/inc \
-    -I$(call gb_UnpackedTarball_get_dir,libwpd)/src/lib \
+    -I$(gb_UnpackedTarball_workdir)/libwpd/inc \
+    -I$(gb_UnpackedTarball_workdir)/libwpd/src/lib \
     $$(INCLUDE) \
 ))
 
diff --git a/external/libwpg/Library_wpg.mk b/external/libwpg/Library_wpg.mk
index e59133ea588d..7255db70d405 100644
--- a/external/libwpg/Library_wpg.mk
+++ b/external/libwpg/Library_wpg.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_Library_use_externals,wpg,\
 $(eval $(call gb_Library_set_warnings_disabled,wpg))
 
 $(eval $(call gb_Library_set_include,wpg,\
-    -I$(call gb_UnpackedTarball_get_dir,libwpg)/inc \
+    -I$(gb_UnpackedTarball_workdir)/libwpg/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index 8986ae6e6288..78ade9143b9d 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -18,8 +18,8 @@ $(eval $(call gb_Library_use_externals,wps,\
 $(eval $(call gb_Library_set_warnings_disabled,wps))
 
 $(eval $(call gb_Library_set_include,wps,\
-    -I$(call gb_UnpackedTarball_get_dir,libwps)/inc \
-    -I$(call gb_UnpackedTarball_get_dir,libwps)/src/lib \
+    -I$(gb_UnpackedTarball_workdir)/libwps/inc \
+    -I$(gb_UnpackedTarball_workdir)/libwps/src/lib \
     $$(INCLUDE) \
 ))
 
diff --git a/external/libxslt/ExternalProject_libxslt.mk b/external/libxslt/ExternalProject_libxslt.mk
index 842f60db2e89..51a8775da155 100644
--- a/external/libxslt/ExternalProject_libxslt.mk
+++ b/external/libxslt/ExternalProject_libxslt.mk
@@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,libxslt,build):
 			$(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \
 			$(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \
 			vcmanifest=yes \
-			lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \
+			lib=$(gb_UnpackedTarball_workdir)/libxml2/win32/bin.msvc \
 		&& nmake \
 	,win32)
 	$(call gb_Trace_EndRange,libxslt,EXTERNAL)
@@ -41,7 +41,7 @@ $(call gb_ExternalProject_get_state_target,libxslt,build):
 			$(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
 			$(if $(filter iOS,$(OS)),LIBS="-liconv") \
 			--disable-shared,--disable-static) \
-			$(if $(SYSTEM_LIBXML),,--with-libxml-src=$(call gb_UnpackedTarball_get_dir,libxml2)) \
+			$(if $(SYSTEM_LIBXML),,--with-libxml-src=$(gb_UnpackedTarball_workdir)/libxml2) \
 		&& chmod 777 xslt-config \
 		&& $(MAKE) \
 		$(if $(filter MACOSX,$(OS)),\
diff --git a/external/lxml/ExternalProject_lxml.mk b/external/lxml/ExternalProject_lxml.mk
index a282546b1a11..a2ca0243cf7c 100644
--- a/external/lxml/ExternalProject_lxml.mk
+++ b/external/lxml/ExternalProject_lxml.mk
@@ -24,17 +24,17 @@ $(call gb_ExternalProject_get_state_target,lxml,build): \
     $(call gb_ExternalExecutable_get_dependencies,python)
 	$(call gb_Trace_StartRange,lxml,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
-		export PYTHONPATH=$${PYTHONPATH:+$$PYTHONPATH:}$(call gb_UnpackedTarball_get_dir,lxml)/install && \
+		export PYTHONPATH=$${PYTHONPATH:+$$PYTHONPATH:}$(gb_UnpackedTarball_workdir)/lxml/install && \
 		$(if $(PYTHON_FOR_BUILD), \
 			unset MACOSX_DEPLOYMENT_TARGET && , \
-			CFLAGS="$$CFLAGS -I$(call gb_UnpackedTarball_get_dir,python3)" && \
-			CFLAGS="$$CFLAGS -I$(call gb_UnpackedTarball_get_dir,python3)/Include" && \
-			LDFLAGS="$$LDFLAGS -L$(call gb_UnpackedTarball_get_dir,python3)" && \
-			_PYTHON_PROJECT_BASE=$(call gb_UnpackedTarball_get_dir,python3) && \
+			CFLAGS="$$CFLAGS -I$(gb_UnpackedTarball_workdir)/python3" && \
+			CFLAGS="$$CFLAGS -I$(gb_UnpackedTarball_workdir)/python3/Include" && \
+			LDFLAGS="$$LDFLAGS -L$(gb_UnpackedTarball_workdir)/python3" && \
+			_PYTHON_PROJECT_BASE=$(gb_UnpackedTarball_workdir)/python3 && \
 			export CFLAGS LDFLAGS _PYTHON_PROJECT_BASE && ) \
 		$(lxml_PYTHON) setup.py build \
-			$(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,libxml2)/xml2-config) \
-			$(if $(SYSTEM_LIBXSLT),,--with-xslt-config=$(call gb_UnpackedTarball_get_dir,libxslt)/xslt-config) && \
+			$(if $(SYSTEM_LIBXML),,--with-xml2-config=$(gb_UnpackedTarball_workdir)/libxml2/xml2-config) \
+			$(if $(SYSTEM_LIBXSLT),,--with-xslt-config=$(gb_UnpackedTarball_workdir)/libxslt/xslt-config) && \
 		rm -fr install && \
 		mkdir install && \
 		$(lxml_PYTHON) setup.py install \
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index 1849ec3af29a..d7f726c34dcd 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,mariadb-connector-c,mariadb-connecto
 
 $(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\
 	$$(INCLUDE) \
-	-I$(call gb_UnpackedTarball_get_dir,mariadb-connector-c)/include \
+	-I$(gb_UnpackedTarball_workdir)/mariadb-connector-c/include \
 ))
 
 # This is needed for MSVC 2008: it somehow finds a dlopen somewhere
@@ -27,7 +27,7 @@ ifeq ($(OS),WNT)
 $(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-D_TIMESPEC_DEFINED -DHAVE_STRTOULL -DHAVE_WINCRYPT))
 $(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\
 	$$(INCLUDE) \
-	-I$(call gb_UnpackedTarball_get_dir,mariadb-connector-c)/win-iconv \
+	-I$(gb_UnpackedTarball_workdir)/mariadb-connector-c/win-iconv \
 ))
 else
 $(eval $(call gb_StaticLibrary_use_external,mariadb-connector-c,openssl_headers))
diff --git a/external/mdnsresponder/StaticLibrary_mDNSResponder.mk b/external/mdnsresponder/StaticLibrary_mDNSResponder.mk
index 222776ad3a86..d67f62cb39f1 100644
--- a/external/mdnsresponder/StaticLibrary_mDNSResponder.mk
+++ b/external/mdnsresponder/StaticLibrary_mDNSResponder.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_StaticLibrary_set_warnings_disabled,mDNSResponder))
 $(eval $(call gb_StaticLibrary_use_unpacked,mDNSResponder,mDNSResponder))
 
 $(eval $(call gb_StaticLibrary_set_include,mDNSResponder,\
-	-I$(call gb_UnpackedTarball_get_dir,mDNSResponder)/mDNSShared \
+	-I$(gb_UnpackedTarball_workdir)/mDNSResponder/mDNSShared \
 	$$(INCLUDE) \
 ))
 
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index 79e7f8eb2b2e..e129fba93d49 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -83,9 +83,9 @@ $(call gb_ExternalProject_get_state_target,nss,build): \
 			$(if $(filter ANDROID,$(OS)),OS_TARGET=Android OS_TARGET_RELEASE=$(ANDROID_API_LEVEL) ARCHFLAG="" DEFAULT_COMPILER=clang ANDROID_NDK=$(ANDROID_NDK_DIR) ANDROID_TOOLCHAIN_VERSION=$(ANDROID_GCC_TOOLCHAIN_VERSION) ANDROID_PREFIX=$(HOST_PLATFORM) ANDROID_SYSROOT=$(ANDROID_NDK_DIR)/sysroot) \
 			NSS_DISABLE_GTESTS=1 \
 			nss_build_all \
-		&& rm -f $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.a \
+		&& rm -f $(gb_UnpackedTarball_workdir)/nss/dist/out/lib/*.a \
 		$(if $(filter MACOSX,$(OS)),\
-			&& chmod u+w $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.dylib \
+			&& chmod u+w $(gb_UnpackedTarball_workdir)/nss/dist/out/lib/*.dylib \
 			&& $(PERL) \
 				$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
 				$(EXTERNAL_WORKDIR)/dist/out/lib/libfreebl3.dylib \
diff --git a/external/onlineupdate/CustomTarget_generated.mk b/external/onlineupdate/CustomTarget_generated.mk
index 813394a2c6e1..374130830b8d 100644
--- a/external/onlineupdate/CustomTarget_generated.mk
+++ b/external/onlineupdate/CustomTarget_generated.mk
@@ -16,7 +16,7 @@ $(onlineupdate_INC)/primaryCert.h $(onlineupdate_INC)/secondaryCert.h : \
         | $(call gb_UnpackedTarball_get_target,onlineupdate)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,,1)
 	mkdir -p $(dir $@)
-	PYPATH=$${PYPATH:+$$PYPATH$(gb_CLASSPATHSEP)}'$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/updater' $(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/onlineupdate/generate.py $@ '$(ONLINEUPDATE_MAR_CERTIFICATEDER)'
+	PYPATH=$${PYPATH:+$$PYPATH$(gb_CLASSPATHSEP)}'$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/updater' $(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/onlineupdate/generate.py $@ '$(ONLINEUPDATE_MAR_CERTIFICATEDER)'
 
 $(call gb_CustomTarget_get_target,external/onlineupdate/generated) : \
 	$(onlineupdate_INC)/primaryCert.h \
diff --git a/external/onlineupdate/Executable_mar.mk b/external/onlineupdate/Executable_mar.mk
index bcfd2f4a7f97..abb52762d685 100644
--- a/external/onlineupdate/Executable_mar.mk
+++ b/external/onlineupdate/Executable_mar.mk
@@ -12,10 +12,10 @@ $(eval $(call gb_Executable_Executable,mar))
 $(eval $(call gb_Executable_use_unpacked,mar,onlineupdate))
 
 $(eval $(call gb_Executable_set_include,mar,\
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/libmar/src/ \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/libmar/verify/ \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/libmar/sign/ \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include/onlineupdate \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/libmar/src/ \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/libmar/verify/ \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/libmar/sign/ \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/include/onlineupdate \
 	$$(INCLUDE) \
 ))
 
diff --git a/external/onlineupdate/Executable_mbsdiff.mk b/external/onlineupdate/Executable_mbsdiff.mk
index a41729909586..6b7766beb537 100644
--- a/external/onlineupdate/Executable_mbsdiff.mk
+++ b/external/onlineupdate/Executable_mbsdiff.mk
@@ -12,8 +12,8 @@ $(eval $(call gb_Executable_Executable,mbsdiff))
 $(eval $(call gb_Executable_use_unpacked,mbsdiff,onlineupdate))
 
 $(eval $(call gb_Executable_set_include,mbsdiff,\
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/inc \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/toolkit/mozapps/update/updater \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/inc \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/toolkit/mozapps/update/updater \
 	$$(INCLUDE) \
 ))
 
diff --git a/external/onlineupdate/Executable_test_updater_dialog.mk b/external/onlineupdate/Executable_test_updater_dialog.mk
index 4d31c7f24f30..944abd8169e5 100644
--- a/external/onlineupdate/Executable_test_updater_dialog.mk
+++ b/external/onlineupdate/Executable_test_updater_dialog.mk
@@ -12,13 +12,13 @@ $(eval $(call gb_Executable_Executable,test_updater_dialog))
 $(eval $(call gb_Executable_use_unpacked,test_updater_dialog,onlineupdate))
 
 $(eval $(call gb_Executable_set_include,test_updater_dialog,\
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/inc \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/common \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/updater/xpcom/glue \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/updater \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include/onlineupdate \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/toolkit/mozapps/update/common \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/inc \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/common \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/updater/xpcom/glue \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/updater \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/include/onlineupdate \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/include \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/toolkit/mozapps/update/common \
 	$$(INCLUDE) \
 	$(if $(filter-out WNT,$(OS)),$$(GTK3_CFLAGS) ) \
 ))
diff --git a/external/onlineupdate/Executable_update_service.mk b/external/onlineupdate/Executable_update_service.mk
index 2d301c5acead..40e45f585a2c 100644
--- a/external/onlineupdate/Executable_update_service.mk
+++ b/external/onlineupdate/Executable_update_service.mk
@@ -14,17 +14,17 @@ $(eval $(call gb_Executable_use_unpacked,update_service,onlineupdate))
 $(eval $(call gb_Executable_set_targettype_gui,update_service,YES))
 
 $(eval $(call gb_Executable_set_include,update_service,\
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/inc \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/libmar/src/ \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/libmar/verify/ \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/libmar/sign/ \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/common/ \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include/onlineupdate \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/toolkit/mozapps/update/common \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/toolkit/xre \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/xpcom/base \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/xpcom/string \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/inc \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/libmar/src/ \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/libmar/verify/ \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/libmar/sign/ \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/common/ \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/include/onlineupdate \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/include \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/toolkit/mozapps/update/common \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/toolkit/xre \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/xpcom/base \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/xpcom/string \
 	$$(INCLUDE) \
 ))
 
diff --git a/external/onlineupdate/Executable_updater.mk b/external/onlineupdate/Executable_updater.mk
index 2196ff5df579..ba6f4a9dfc60 100644
--- a/external/onlineupdate/Executable_updater.mk
+++ b/external/onlineupdate/Executable_updater.mk
@@ -12,18 +12,18 @@ $(eval $(call gb_Executable_Executable,updater))
 $(eval $(call gb_Executable_use_unpacked,updater,onlineupdate))
 
 $(eval $(call gb_Executable_set_include,updater,\
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/inc \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/common \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/updater/xpcom/glue \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/service \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include/onlineupdate \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/modules/xz-embedded/src \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/toolkit/mozapps/update/common \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/toolkit/mozapps/update/updater \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/toolkit/xre \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/xpcom/base \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/xpcom/string \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/inc \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/common \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/updater/xpcom/glue \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/service \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/include/onlineupdate \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/include \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/modules/xz-embedded/src \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/toolkit/mozapps/update/common \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/toolkit/mozapps/update/updater \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/toolkit/xre \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/xpcom/base \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/xpcom/string \
 	$$(INCLUDE) \
 	$(if $(filter-out WNT,$(OS)),$$(GTK3_CFLAGS) ) \
 ))
diff --git a/external/onlineupdate/Library_install_updateservice.mk b/external/onlineupdate/Library_install_updateservice.mk
index 216b81a95a07..86d6101abe44 100644
--- a/external/onlineupdate/Library_install_updateservice.mk
+++ b/external/onlineupdate/Library_install_updateservice.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_Library_Library,install_updateservice))
 $(eval $(call gb_Library_use_unpacked,install_updateservice,onlineupdate))
 
 $(eval $(call gb_Library_set_include,install_updateservice, \
-    -I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/common \
+    -I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/common \
     $$(INCLUDE) \
 ))
 
diff --git a/external/onlineupdate/StaticLibrary_libmar.mk b/external/onlineupdate/StaticLibrary_libmar.mk
index 836b50038784..aa780a4f0071 100644
--- a/external/onlineupdate/StaticLibrary_libmar.mk
+++ b/external/onlineupdate/StaticLibrary_libmar.mk
@@ -12,9 +12,9 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,libmar))
 $(eval $(call gb_StaticLibrary_use_unpacked,libmar,onlineupdate))
 
 $(eval $(call gb_StaticLibrary_set_include,libmar,\
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/libmar/src/ \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include/onlineupdate \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/other-licenses/nsis/Contrib/CityHash/cityhash \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/libmar/src/ \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/include/onlineupdate \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/other-licenses/nsis/Contrib/CityHash/cityhash \
 	$$(INCLUDE) \
 ))
 
diff --git a/external/onlineupdate/StaticLibrary_libmarverify.mk b/external/onlineupdate/StaticLibrary_libmarverify.mk
index 9915fcb66256..f746c844bb5d 100644
--- a/external/onlineupdate/StaticLibrary_libmarverify.mk
+++ b/external/onlineupdate/StaticLibrary_libmarverify.mk
@@ -12,8 +12,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,libmarverify))
 $(eval $(call gb_StaticLibrary_use_unpacked,libmarverify,onlineupdate))
 
 $(eval $(call gb_StaticLibrary_set_include,libmarverify,\
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/libmar/src/ \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include/onlineupdate \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/libmar/src/ \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/include/onlineupdate \
 	$$(INCLUDE) \
 ))
 
diff --git a/external/onlineupdate/StaticLibrary_updatehelper.mk b/external/onlineupdate/StaticLibrary_updatehelper.mk
index 79da4f809ca7..e3b5cf4a3bf9 100644
--- a/external/onlineupdate/StaticLibrary_updatehelper.mk
+++ b/external/onlineupdate/StaticLibrary_updatehelper.mk
@@ -12,14 +12,14 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,updatehelper))
 $(eval $(call gb_StaticLibrary_use_unpacked,updatehelper,onlineupdate))
 
 $(eval $(call gb_StaticLibrary_set_include,updatehelper,\
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/inc/ \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/service \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/common \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include/onlineupdate \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/mfbt/double-conversion \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/toolkit/mozapps/update/common \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/xpcom/base \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/inc/ \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/service \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/common \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/include/onlineupdate \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/include \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/mfbt/double-conversion \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/toolkit/mozapps/update/common \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/xpcom/base \
 	$$(INCLUDE) \
 ))
 
diff --git a/external/onlineupdate/WinResTarget_updater.mk b/external/onlineupdate/WinResTarget_updater.mk
index edb2db7483e6..87c215787c46 100644
--- a/external/onlineupdate/WinResTarget_updater.mk
+++ b/external/onlineupdate/WinResTarget_updater.mk
@@ -5,11 +5,11 @@ $(call gb_WinResTarget_get_target,updaterres,updaterres): | \
 
 $(eval $(call gb_WinResTarget_set_include,updaterres,\
 	$$(INCLUDE) \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/common \
-	-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/updater \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/common \
+	-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/updater \
 ))
 
 $(call gb_WinResTarget_get_clean_target,updaterres): \
-    RCFILE := $(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/updater/updater.rc
+    RCFILE := $(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/updater/updater.rc
 $(call gb_WinResTarget_get_target,updaterres): \
-    RCFILE := $(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/updater/updater.rc
+    RCFILE := $(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/updater/updater.rc
diff --git a/external/openldap/ExternalProject_openldap.mk b/external/openldap/ExternalProject_openldap.mk
index e02a35d9943f..d684fa49142d 100644
--- a/external/openldap/ExternalProject_openldap.mk
+++ b/external/openldap/ExternalProject_openldap.mk
@@ -26,7 +26,7 @@ endif
 
 openldap_LDFLAGS = $(call gb_ExternalProject_get_link_flags,openldap)
 ifeq ($(SYSTEM_OPENSSL),)
-openldap_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,openssl)
+openldap_LDFLAGS += -L$(gb_UnpackedTarball_workdir)/openssl
 endif
 ifeq ($(OS),LINUX)
 openldap_LDFLAGS += -pthread
@@ -50,8 +50,8 @@ $(call gb_ExternalProject_get_state_target,openldap,build) :
 			$(if $(SYSTEM_OPENSSL), \
 				CPPFLAGS="$(CPPFLAGS) $(OPENSSL_CFLAGS)" CFLAGS="$(CFLAGS) $(openldap_CFLAGS) $(OPENSSL_CFLAGS) $(call gb_ExternalProject_get_build_flags,openldap)" LDFLAGS="$(LDFLAGS) $(openldap_LDFLAGS) $(OPENSSL_LIBS)" \
 				, \
-				CPPFLAGS="$(CPPFLAGS) -I$(call gb_UnpackedTarball_get_dir,openssl)/include" \
-				CFLAGS="$(CFLAGS) $(openldap_CFLAGS) $(call gb_ExternalProject_get_build_flags,openldap) -I$(call gb_UnpackedTarball_get_dir,openssl)/include" \
+				CPPFLAGS="$(CPPFLAGS) -I$(gb_UnpackedTarball_workdir)/openssl/include" \
+				CFLAGS="$(CFLAGS) $(openldap_CFLAGS) $(call gb_ExternalProject_get_build_flags,openldap) -I$(gb_UnpackedTarball_workdir)/openssl/include" \
 			) \
 			$(if $(openldap_LDFLAGS),LDFLAGS="$(LDFLAGS) $(openldap_LDFLAGS)") \
 		&& MAKEFLAGS= && $(MAKE) \
diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk
index 898cdd12cce1..648b4d22ca96 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -16,10 +16,10 @@ $(eval $(call gb_Library_set_warnings_disabled,pdfium))
 $(eval $(call gb_Library_set_precompiled_header,pdfium,external/pdfium/inc/pch/precompiled_pdfium))
 
 $(eval $(call gb_Library_set_include,pdfium,\
-    -I$(call gb_UnpackedTarball_get_dir,pdfium) \
-    -I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party \
-    -I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party/agg23 \
-    $(if $(filter TRUE,$(SYSTEM_ABSEIL)),$(ABSEIL_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party/abseil-cpp) \
+    -I$(gb_UnpackedTarball_workdir)/pdfium \
+    -I$(gb_UnpackedTarball_workdir)/pdfium/third_party \
+    -I$(gb_UnpackedTarball_workdir)/pdfium/third_party/agg23 \
+    $(if $(filter TRUE,$(SYSTEM_ABSEIL)),$(ABSEIL_CFLAGS),-I$(gb_UnpackedTarball_workdir)/pdfium/third_party/abseil-cpp) \
     $(if $(filter TRUE,$(SYSTEM_OPENJPEG2)),$(OPENJPEG2_CFLAGS)) \
     $$(INCLUDE) \
 ))
@@ -603,8 +603,8 @@ $(eval $(call gb_Library_add_defs,pdfium,\
 
 else
 $(eval $(call gb_Library_set_include,pdfium,\
-    -I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party/freetype/include/ \
-    -I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party/freetype/src/include/ \
+    -I$(gb_UnpackedTarball_workdir)/pdfium/third_party/freetype/include/ \
+    -I$(gb_UnpackedTarball_workdir)/pdfium/third_party/freetype/src/include/ \
     $$(INCLUDE) \
 ))
 
diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk
index 1d0a13b6bb03..fe1c7c0a54a9 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -43,17 +43,17 @@ endif
 
 ifeq ($(ENABLE_OPENSSL),TRUE)
 ifeq ($(SYSTEM_OPENSSL),)
-postgresql_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,openssl)/include
-postgresql_LDFLAGS  += -L$(call gb_UnpackedTarball_get_dir,openssl) $(if $(filter $(OS),LINUX),-pthread)
+postgresql_CPPFLAGS += -I$(gb_UnpackedTarball_workdir)/openssl/include
+postgresql_LDFLAGS  += -L$(gb_UnpackedTarball_workdir)/openssl $(if $(filter $(OS),LINUX),-pthread)
 endif
 endif
 
 ifeq ($(SYSTEM_OPENLDAP),)
-postgresql_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,openldap)/include
+postgresql_CPPFLAGS += -I$(gb_UnpackedTarball_workdir)/openldap/include
 postgresql_LDFLAGS  += \
-	-L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap_r/.libs \
-	-L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap/.libs \
-	-L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/liblber/.libs \
+	-L$(gb_UnpackedTarball_workdir)/openldap/libraries/libldap_r/.libs \
+	-L$(gb_UnpackedTarball_workdir)/openldap/libraries/libldap/.libs \
+	-L$(gb_UnpackedTarball_workdir)/openldap/libraries/liblber/.libs \
 
 endif
 
diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk
index 0f95cc36563c..c0686eaf3f87 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -37,12 +37,12 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
 	$(call gb_Trace_StartRange,python3,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build $(gb_MSBUILD_CONFIG_AND_PLATFORM) \
-			/p:bz2Dir=$(call gb_UnpackedTarball_get_dir,bzip2) \
-			/p:opensslIncludeDir=$(call gb_UnpackedTarball_get_dir,openssl)/include \
-			/p:opensslOutDir=$(call gb_UnpackedTarball_get_dir,openssl) \
-			/p:zlibDir=$(call gb_UnpackedTarball_get_dir,zlib) \
-			/p:libffiOutDir=$(call gb_UnpackedTarball_get_dir,libffi)/$(HOST_PLATFORM)/.libs \
-			/p:libffiIncludeDir=$(call gb_UnpackedTarball_get_dir,libffi)/$(HOST_PLATFORM)/include \
+			/p:bz2Dir=$(gb_UnpackedTarball_workdir)/bzip2 \
+			/p:opensslIncludeDir=$(gb_UnpackedTarball_workdir)/openssl/include \
+			/p:opensslOutDir=$(gb_UnpackedTarball_workdir)/openssl \
+			/p:zlibDir=$(gb_UnpackedTarball_workdir)/zlib \
+			/p:libffiOutDir=$(gb_UnpackedTarball_workdir)/libffi/$(HOST_PLATFORM)/.libs \
+			/p:libffiIncludeDir=$(gb_UnpackedTarball_workdir)/libffi/$(HOST_PLATFORM)/include \
 			/maxcpucount \
 			/p:PlatformToolset=$(VCTOOLSET) /p:VisualStudioVersion=$(VCVER) /ToolsVersion:Current \
 			$(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
@@ -102,22 +102,22 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
 			--enable-shared \
 		) \
 		$(if $(ENABLE_OPENSSL),$(if $(SYSTEM_OPENSSL),,\
-			--with-openssl=$(call gb_UnpackedTarball_get_dir,openssl) \
+			--with-openssl=$(gb_UnpackedTarball_workdir)/openssl \
 		) ) \
 		$(if $(filter LINUX,$(OS)), \
-			PKG_CONFIG_LIBDIR="$(call gb_UnpackedTarball_get_dir,libffi)/$(HOST_PLATFORM)$${PKG_CONFIG_LIBDIR:+:$$PKG_CONFIG_LIBDIR}" \
+			PKG_CONFIG_LIBDIR="$(gb_UnpackedTarball_workdir)/libffi/$(HOST_PLATFORM)$${PKG_CONFIG_LIBDIR:+:$$PKG_CONFIG_LIBDIR}" \
 		) \
 		CC="$(strip $(CC) \
 			$(if $(filter -fsanitize=undefined,$(CC)),-fno-sanitize=function) \
-			$(if $(SYSTEM_BZIP2),,-I$(call gb_UnpackedTarball_get_dir,bzip2)) \
-			$(if $(SYSTEM_EXPAT),,-I$(call gb_UnpackedTarball_get_dir,expat)/lib) \
+			$(if $(SYSTEM_BZIP2),,-I$(gb_UnpackedTarball_workdir)/bzip2) \
+			$(if $(SYSTEM_EXPAT),,-I$(gb_UnpackedTarball_workdir)/expat/lib) \
 			$(if $(SYSBASE), -I$(SYSBASE)/usr/include) \
 			)" \
 		$(if $(python3_cflags),CFLAGS='$(python3_cflags)') \
 		$(if $(filter -fsanitize=%,$(CC)),LINKCC="$(CXX) -pthread") \
 		LDFLAGS="$(strip $(LDFLAGS) \
-			$(if $(filter LINUX,$(OS)),-L$(call gb_UnpackedTarball_get_dir,libffi)/$(HOST_PLATFORM)/.libs) \
-			$(if $(SYSTEM_BZIP2),,-L$(call gb_UnpackedTarball_get_dir,bzip2)) \
+			$(if $(filter LINUX,$(OS)),-L$(gb_UnpackedTarball_workdir)/libffi/$(HOST_PLATFORM)/.libs) \
+			$(if $(SYSTEM_BZIP2),,-L$(gb_UnpackedTarball_workdir)/bzip2) \
 			$(if $(SYSTEM_EXPAT),,-L$(gb_StaticLibrary_WORKDIR)) \
 			$(if $(SYSTEM_ZLIB),,-L$(gb_StaticLibrary_WORKDIR)) \
 			$(if $(SYSBASE), -L$(SYSBASE)/usr/lib) \
@@ -142,7 +142,7 @@ endif
 
 ifeq ($(OS),MACOSX)
 
-python3_fw_prefix=$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO/LibreOfficePython.framework
+python3_fw_prefix=$(gb_UnpackedTarball_workdir)/python3/python-inst/@__________________________________________________OOO/LibreOfficePython.framework
 
 # rule to allow relocating the whole framework, removing reference to buildinstallation directory
 # also scripts are not allowed to be signed as executables (with extended attributes), but need to
diff --git a/external/python3/GeneratedPackage_python3.mk b/external/python3/GeneratedPackage_python3.mk
index ffde38be586c..20ff206d623b 100644
--- a/external/python3/GeneratedPackage_python3.mk
+++ b/external/python3/GeneratedPackage_python3.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_GeneratedPackage_GeneratedPackage,python3,$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO))
+$(eval $(call gb_GeneratedPackage_GeneratedPackage,python3,$(gb_UnpackedTarball_workdir)/python3/python-inst/@__________________________________________________OOO))
 
 $(eval $(call gb_GeneratedPackage_use_unpacked,python3,python3))
 
diff --git a/external/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk
index 74759c65be31..8ac05880766b 100644
--- a/external/redland/ExternalProject_raptor.mk
+++ b/external/redland/ExternalProject_raptor.mk
@@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
 			, \
 				--enable-shared --disable-static \
 			) \
-			$(if $(SYSTEM_LIBXML),$(if $(filter-out MACOSX,$(OS)),--without-xml2-config),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,libxml2)/xml2-config) \
+			$(if $(SYSTEM_LIBXML),$(if $(filter-out MACOSX,$(OS)),--without-xml2-config),--with-xml2-config=$(gb_UnpackedTarball_workdir)/libxml2/xml2-config) \
 		&& $(MAKE) \
 	)
 	$(call gb_Trace_EndRange,raptor,EXTERNAL)
diff --git a/external/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk
index de53b4e4f3d2..3d0b522f664a 100644
--- a/external/redland/ExternalProject_rasqal.mk
+++ b/external/redland/ExternalProject_rasqal.mk
@@ -29,8 +29,8 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
 			$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
 		$(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \
 		PKG_CONFIG="" \
-		RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
-		RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2" \
+		RAPTOR2_CFLAGS="-I$(gb_UnpackedTarball_workdir)/raptor/src" \
+		RAPTOR2_LIBS="-L$(gb_UnpackedTarball_workdir)/raptor/src/.libs -lraptor2" \
 		$(gb_RUN_CONFIGURE) ./configure --disable-gtk-doc \
 			--with-regex-library=posix \
 			--with-decimal=none \
@@ -44,7 +44,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
 			, \
 				--enable-shared --disable-static \
 			) \
-			$(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,libxml2)/xml2-config) \
+			$(if $(SYSTEM_LIBXML),,--with-xml2-config=$(gb_UnpackedTarball_workdir)/libxml2/xml2-config) \
 		&& $(MAKE) \
 		$(if $(filter MACOSX,$(OS)),&& $(PERL) \
 			$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
diff --git a/external/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk
index 0f7afa6d8182..67b043edebec 100644
--- a/external/redland/ExternalProject_redland.mk
+++ b/external/redland/ExternalProject_redland.mk
@@ -30,10 +30,10 @@ $(call gb_ExternalProject_get_state_target,redland,build):
 			$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
 		CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
 		PKG_CONFIG="" \
-		RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
-		RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 $(LIBXML_LIBS)" \
-		RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \
-		RASQAL_LIBS="-L$(call gb_UnpackedTarball_get_dir,rasqal)/src/.libs -lrasqal" \
+		RAPTOR2_CFLAGS="-I$(gb_UnpackedTarball_workdir)/raptor/src" \
+		RAPTOR2_LIBS="-L$(gb_UnpackedTarball_workdir)/raptor/src/.libs -lraptor2 $(LIBXML_LIBS)" \
+		RASQAL_CFLAGS="-I$(gb_UnpackedTarball_workdir)/rasqal/src" \
+		RASQAL_LIBS="-L$(gb_UnpackedTarball_workdir)/rasqal/src/.libs -lrasqal" \
 		$(gb_RUN_CONFIGURE) ./configure --disable-gtk-doc \
 			--disable-modular \
 			--without-threads \
diff --git a/external/redland/Library_raptor.mk b/external/redland/Library_raptor.mk
index b2779f7dec17..832a2e7d03d3 100644
--- a/external/redland/Library_raptor.mk
+++ b/external/redland/Library_raptor.mk
@@ -10,7 +10,7 @@
 $(eval $(call gb_Library_Library,raptor2))
 
 $(eval $(call gb_Library_set_include,raptor2, \
-    -I$(call gb_UnpackedTarball_get_dir,raptor)/src \
+    -I$(gb_UnpackedTarball_workdir)/raptor/src \
     $$(INCLUDE) \
 ))
 
diff --git a/external/redland/Library_rasqal.mk b/external/redland/Library_rasqal.mk
index 79171d9045fe..ab83ad3d303d 100644
--- a/external/redland/Library_rasqal.mk
+++ b/external/redland/Library_rasqal.mk
@@ -35,9 +35,9 @@ $(eval $(call gb_Library_add_defs,rasqal,\
 ))
 
 $(eval $(call gb_Library_set_include,rasqal,\
-	-I$(call gb_UnpackedTarball_get_dir,rasqal)/libmtwist \
-	-I$(call gb_UnpackedTarball_get_dir,rasqal)/libsv \
-	-I$(call gb_UnpackedTarball_get_dir,rasqal)/src \
+	-I$(gb_UnpackedTarball_workdir)/rasqal/libmtwist \
+	-I$(gb_UnpackedTarball_workdir)/rasqal/libsv \
+	-I$(gb_UnpackedTarball_workdir)/rasqal/src \
 	$$(INCLUDE) \
 ))
 
diff --git a/external/redland/Library_rdf.mk b/external/redland/Library_rdf.mk
index cc427b339834..c723d4b4d11d 100644
--- a/external/redland/Library_rdf.mk
+++ b/external/redland/Library_rdf.mk
@@ -10,7 +10,7 @@
 $(eval $(call gb_Library_Library,rdf))
 
 $(eval $(call gb_Library_set_include,rdf, \
-    -I$(call gb_UnpackedTarball_get_dir,redland)/src \
+    -I$(gb_UnpackedTarball_workdir)/redland/src \
     $$(INCLUDE) \
 ))
 
diff --git a/external/rhino/ExternalProject_rhino.mk b/external/rhino/ExternalProject_rhino.mk
index 3df0aaa4e2d9..77a0b6cd21eb 100644
--- a/external/rhino/ExternalProject_rhino.mk
+++ b/external/rhino/ExternalProject_rhino.mk
@@ -16,31 +16,31 @@ $(eval $(call gb_ExternalProject_register_targets,rhino,\
 $(call gb_ExternalProject_get_state_target,rhino,build) :
 	$(call gb_Trace_StartRange,rhino,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
-		mkdir $(call gb_UnpackedTarball_get_dir,rhino)/build \
-		&& cd $(call gb_UnpackedTarball_get_dir,rhino) \
+		mkdir $(gb_UnpackedTarball_workdir)/rhino/build \
+		&& cd $(gb_UnpackedTarball_workdir)/rhino \
 		&& $(call gb_JavaClassSet_JAVACCOMMAND,$(JAVA_TARGET_VER)) $(gb_JavaClassSet_JAVACDEBUG) \
-			-d $(call gb_UnpackedTarball_get_dir,rhino)/build/content \
+			-d $(gb_UnpackedTarball_workdir)/rhino/build/content \
 			@$(SRCDIR)/external/rhino/filelist.txt \
-		&& mkdir $(call gb_UnpackedTarball_get_dir,rhino)/build/content/META-INF \
-		&& cp $(call gb_UnpackedTarball_get_dir,rhino)/LICENSE.txt \
-			$(call gb_UnpackedTarball_get_dir,rhino)/NOTICE-tools.txt \
-			$(call gb_UnpackedTarball_get_dir,rhino)/NOTICE.txt \
-			$(call gb_UnpackedTarball_get_dir,rhino)/build/content/META-INF/ \
-		&& $(gb_Jar_JARCOMMAND) -cf $(call gb_UnpackedTarball_get_dir,rhino)/build/js.jar \
-			-C $(call gb_UnpackedTarball_get_dir,rhino)/build/content . \
-			-C $(call gb_UnpackedTarball_get_dir,rhino)/src \
+		&& mkdir $(gb_UnpackedTarball_workdir)/rhino/build/content/META-INF \
+		&& cp $(gb_UnpackedTarball_workdir)/rhino/LICENSE.txt \
+			$(gb_UnpackedTarball_workdir)/rhino/NOTICE-tools.txt \
+			$(gb_UnpackedTarball_workdir)/rhino/NOTICE.txt \
+			$(gb_UnpackedTarball_workdir)/rhino/build/content/META-INF/ \
+		&& $(gb_Jar_JARCOMMAND) -cf $(gb_UnpackedTarball_workdir)/rhino/build/js.jar \
+			-C $(gb_UnpackedTarball_workdir)/rhino/build/content . \
+			-C $(gb_UnpackedTarball_workdir)/rhino/src \
 			org/mozilla/javascript/commonjs/module/package.html \
-			-C $(call gb_UnpackedTarball_get_dir,rhino)/src \
+			-C $(gb_UnpackedTarball_workdir)/rhino/src \
 			org/mozilla/javascript/commonjs/module/provider/package.html \
-			-C $(call gb_UnpackedTarball_get_dir,rhino)/src \
+			-C $(gb_UnpackedTarball_workdir)/rhino/src \
 			org/mozilla/javascript/resources/Messages.properties \
-			-C $(call gb_UnpackedTarball_get_dir,rhino)/src \
+			-C $(gb_UnpackedTarball_workdir)/rhino/src \
 			org/mozilla/javascript/resources/Messages_en.properties \
-			-C $(call gb_UnpackedTarball_get_dir,rhino)/src \
+			-C $(gb_UnpackedTarball_workdir)/rhino/src \
 			org/mozilla/javascript/resources/Messages_fr.properties \
-			-C $(call gb_UnpackedTarball_get_dir,rhino)/src \
+			-C $(gb_UnpackedTarball_workdir)/rhino/src \
 			org/mozilla/javascript/tools/debugger/test.js \
-			-C $(call gb_UnpackedTarball_get_dir,rhino)/src \
+			-C $(gb_UnpackedTarball_workdir)/rhino/src \
 			org/mozilla/javascript/tools/resources/Messages.properties \
 	)
 	$(call gb_Trace_EndRange,rhino,EXTERNAL)
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 55af14cd2daf..9d240e40da0c 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -124,10 +124,10 @@ $(eval $(call gb_Library_use_libraries,skia,\
 
 $(eval $(call gb_Library_set_include,skia,\
     $$(INCLUDE) \
-    -I$(call gb_UnpackedTarball_get_dir,skia) \
-    -I$(call gb_UnpackedTarball_get_dir,skia)/modules/skcms/ \
-    -I$(call gb_UnpackedTarball_get_dir,skia)/third_party/vulkanmemoryallocator/ \
-    -I$(call gb_UnpackedTarball_get_dir,skia)/include/third_party/vulkan/ \
+    -I$(gb_UnpackedTarball_workdir)/skia \
+    -I$(gb_UnpackedTarball_workdir)/skia/modules/skcms/ \
+    -I$(gb_UnpackedTarball_workdir)/skia/third_party/vulkanmemoryallocator/ \
+    -I$(gb_UnpackedTarball_workdir)/skia/include/third_party/vulkan/ \
     -I$(SRCDIR)/external/skia/inc/ \
 ))
 
diff --git a/external/xmlsec/ExternalProject_xmlsec.mk b/external/xmlsec/ExternalProject_xmlsec.mk
index 64b9a18626c6..06e737c3c952 100644
--- a/external/xmlsec/ExternalProject_xmlsec.mk
+++ b/external/xmlsec/ExternalProject_xmlsec.mk
@@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
 	$(call gb_Trace_StartRange,xmlsec,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		cscript /e:javascript configure.js crypto=mscng xslt=no iconv=no static=no \
-			lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \
+			lib=$(gb_UnpackedTarball_workdir)/libxml2/win32/bin.msvc \
 			$(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes cruntime=/MDd) \
 			cflags="$(SOLARINC) -I$(WORKDIR)/UnpackedTarball/libxml2/include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common" \
 		&& nmake \
@@ -57,13 +57,13 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
 				--without-openssl \
 				$(if $(SYSTEM_NSS),, \
 					$(if $(filter MACOSX,$(OS_FOR_BUILD)),--disable-pkgconfig) \
-					NSPR_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include" NSPR_LIBS="-L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib -lnspr4" \
-					NSS_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss" NSS_LIBS="-L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib -lsmime3 -lnss3 -lnssutil3" \
+					NSPR_CFLAGS="-I$(gb_UnpackedTarball_workdir)/nss/dist/out/include" NSPR_LIBS="-L$(gb_UnpackedTarball_workdir)/nss/dist/out/lib -lnspr4" \
+					NSS_CFLAGS="-I$(gb_UnpackedTarball_workdir)/nss/dist/public/nss" NSS_LIBS="-L$(gb_UnpackedTarball_workdir)/nss/dist/out/lib -lsmime3 -lnss3 -lnssutil3" \
 				), \
 				$(if $(ENABLE_OPENSSL), \
 					$(if $(SYSTEM_OPENSSL),, \
-						OPENSSL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,openssl)/include" \
-						OPENSSL_LIBS="-L$(call gb_UnpackedTarball_get_dir,openssl) -lcrypto -lssl" \
+						OPENSSL_CFLAGS="-I$(gb_UnpackedTarball_workdir)/openssl/include" \
+						OPENSSL_LIBS="-L$(gb_UnpackedTarball_workdir)/openssl -lcrypto -lssl" \
 					), \
 					--without-openssl) \
 			) \
diff --git a/external/zlib/StaticLibrary_zlib_x64.mk b/external/zlib/StaticLibrary_zlib_x64.mk
index a51f326d11df..1f1a46fb9df8 100644
--- a/external/zlib/StaticLibrary_zlib_x64.mk
+++ b/external/zlib/StaticLibrary_zlib_x64.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,zlib_x64,zlib))
 $(eval $(call gb_StaticLibrary_set_warnings_disabled,zlib_x64))
 
 $(eval $(call gb_StaticLibrary_set_include,zlib_x64,\
-	-I$(call gb_UnpackedTarball_get_dir,zlib) \
+	-I$(gb_UnpackedTarball_workdir)/zlib \
 	$$(INCLUDE) \
 ))
 
diff --git a/external/zxcvbn-c/StaticLibrary_zxcvbn-c.mk b/external/zxcvbn-c/StaticLibrary_zxcvbn-c.mk
index ac670ad6ed5b..2891167341cf 100644
--- a/external/zxcvbn-c/StaticLibrary_zxcvbn-c.mk
+++ b/external/zxcvbn-c/StaticLibrary_zxcvbn-c.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_StaticLibrary_set_warnings_disabled,zxcvbn-c))
 $(eval $(call gb_StaticLibrary_use_external_project,zxcvbn-c,zxcvbn-c,full))
 
 $(eval $(call gb_StaticLibrary_set_include,zxcvbn-c,\
-    -I$(call gb_UnpackedTarball_get_dir,zxcvbn-c)\
+    -I$(gb_UnpackedTarball_workdir)/zxcvbn-c\
     $$(INCLUDE)\
 ))
 
diff --git a/external/zxing/StaticLibrary_zxing.mk b/external/zxing/StaticLibrary_zxing.mk
index 56d49accd075..ec2e6afd0c09 100644
--- a/external/zxing/StaticLibrary_zxing.mk
+++ b/external/zxing/StaticLibrary_zxing.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_StaticLibrary_use_external,zxing,icu_headers))
 $(eval $(call gb_StaticLibrary_set_warnings_disabled,zxing))
 
 $(eval $(call gb_StaticLibrary_set_include,zxing,\
-	-I$(call gb_UnpackedTarball_get_dir,zxing/core/src/) \
+	-I$(gb_UnpackedTarball_workdir)/zxing/core/src/ \
 	$$(INCLUDE) \
 ))
 
diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk
index 177966f7952d..aaba3c1503de 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -62,7 +62,7 @@ $(i18npool_BIDIR)/%.brk : $(SRCDIR)/i18npool/source/breakiterator/data/%.txt \
 	$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),BRK)
 	$(call gb_Helper_abbreviate_dirs,\
 		$(call gb_ExternalExecutable_get_command,genbrk) \
-		$(if $(SYSTEM_ICU),,-i $(call gb_UnpackedTarball_get_dir,icu)/source/data/out/tmp) \
+		$(if $(SYSTEM_ICU),,-i $(gb_UnpackedTarball_workdir)/icu/source/data/out/tmp) \
 		-r $< -o $@ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
 	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),BRK)
 
diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk
index 379a709da2e4..1048c61fda3f 100644
--- a/jurt/Library_jpipe.mk
+++ b/jurt/Library_jpipe.mk
@@ -67,8 +67,8 @@ $(eval $(call gb_Library_set_include,jpipe, \
     -I$(SRCDIR)/sal/osl/unx \
     -I$(SRCDIR)/sal/rtl \
     -I$(SRCDIR)/sal/textenc \
-    -I$(call gb_UnpackedTarball_get_dir,dtoa) \
-    -I$(call gb_UnpackedTarball_get_dir,dtoa/include) \
+    -I$(gb_UnpackedTarball_workdir)/dtoa \
+    -I$(gb_UnpackedTarball_workdir)/dtoa/include \
 ))
 
 $(eval $(call gb_Library_use_externals,jpipe, \
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index 05bfa6d0cd18..81363028bd42 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -58,7 +58,7 @@ endef
 #
 # gb_ExternalPackage_ExternalPackage_internal name unpacked
 define gb_ExternalPackage_ExternalPackage_internal
-$(call gb_Package_Package_internal,$(1),$(call gb_UnpackedTarball_get_dir,$(2)))
+$(call gb_Package_Package_internal,$(1),$(gb_UnpackedTarball_workdir)/$(2))
 $(call gb_Package_use_unpacked,$(1),$(2))
 
 $(call gb_ExternalPackage_get_target,$(1)) : $(call gb_Package_get_target,$(1))
@@ -86,7 +86,7 @@ endef
 #
 # gb_ExternalPackage_mark_generated_file package file
 define gb_ExternalPackage_mark_generated_file
-$(call gb_UnpackedTarball_get_dir,$(gb_ExternalPackage_UNPACKED_$(1)))/$(2) : \
+$(gb_UnpackedTarball_workdir)/$(gb_ExternalPackage_UNPACKED_$(1))/$(2) : \
 		$(call gb_ExternalProject_get_target,$(gb_ExternalPackage_PROJECT_$(1)))
 $(if $(suffix $(2)),\
 	$(call gb_UnpackedTarbal__ensure_pattern_rule,$(gb_ExternalPackage_UNPACKED_$(1)),$(suffix $(2))),\
diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index 5227e6c13bec..e9496b87761e 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -73,7 +73,7 @@ $(call gb_ExternalProject_get_clean_target,%) :
 #
 # gb_ExternalProject_ExternalProject project
 define gb_ExternalProject_ExternalProject
-$(call gb_ExternalProject_get_target,$(1)) : EXTERNAL_WORKDIR := $(call gb_UnpackedTarball_get_dir,$(1))
+$(call gb_ExternalProject_get_target,$(1)) : EXTERNAL_WORKDIR := $(gb_UnpackedTarball_workdir)/$(1)
 
 $(call gb_ExternalProject_get_preparation_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
 $(call gb_ExternalProject_get_preparation_target,$(1)) :| $(dir $(call gb_ExternalProject_get_target,$(1))).dir
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index dc659c1e4b4d..b8e2321c85ae 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -207,7 +207,8 @@ gb_UnoApiHeadersTarget_get_real_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/nor
 gb_UnoApiHeadersTarget_get_bootstrap_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),bootstrap).done
 gb_UnoApiHeadersTarget_get_comprehensive_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),comprehensive).done
 gb_UnoApiHeadersTarget_get_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),normal).done
-gb_UnpackedTarball_get_dir = $(WORKDIR)/UnpackedTarball/$(1)
+gb_UnpackedTarball_get_dir = $(error please use plain gb_UnpackedTarball_workdir instead)
+gb_UnpackedTarball_workdir := $(WORKDIR)/UnpackedTarball
 gb_UnpackedTarball_get_pristine_dir = $(WORKDIR)/UnpackedTarball/$(1).org
 gb_UnpackedTarball_get_final_target = $(WORKDIR)/UnpackedTarball/$(1).update
 # NOTE: the .done target is hardcoded in solenv/bin/concat-deps.c !
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index eaca4c5d8da3..8e29cfdd6c37 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -98,7 +98,7 @@ endef
 gb_UIConfig_INSTDIR := $(LIBO_SHARE_FOLDER)/config/soffice.cfg
 
 ifneq ($(filter LXML,$(BUILD_TYPE)),)
-gb_UIConfig_LXML_PATH := PYTHONPATH=$${PYTHONPATH:+$$PYTHONPATH:}$(call gb_UnpackedTarball_get_dir,lxml)/install ;
+gb_UIConfig_LXML_PATH := PYTHONPATH=$${PYTHONPATH:+$$PYTHONPATH:}$(gb_UnpackedTarball_workdir)/lxml/install ;
 gb_UIConfig_LXML_TARGET := $(call gb_ExternalProject_get_target,lxml)
 endif
 gb_UIConfig_gla11y_SCRIPT := $(SRCDIR)/bin/gla11y
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 4419dd172870..dd7317e29ec2 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -151,7 +151,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		) \
 	    $(if $(gb_KEEP_PRISTINE), \
 			rm -fr $(call gb_UnpackedTarball_get_pristine_dir,$(2)) && \
-			cp -r $(call gb_UnpackedTarball_get_dir,$(2)) $(call gb_UnpackedTarball_get_pristine_dir,$(2)) && \
+			cp -r $(gb_UnpackedTarball_workdir)/$(2) $(call gb_UnpackedTarball_get_pristine_dir,$(2)) && \
 		) \
 		touch $(1) \
 		)\
@@ -172,7 +172,7 @@ $(call gb_UnpackedTarball_get_preparation_target,%) :
 $(call gb_UnpackedTarball_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),PAT,2)
 	$(call gb_Trace_StartRange,$*,PAT)
-	$(call gb_UnpackedTarball__command,$@,$*,$(call gb_UnpackedTarball_get_dir,$*))
+	$(call gb_UnpackedTarball__command,$@,$*,$(gb_UnpackedTarball_workdir)/$*)
 	$(call gb_Trace_EndRange,$*,PAT)
 
 $(call gb_UnpackedTarball_get_final_target,%) :
@@ -186,7 +186,7 @@ $(call gb_UnpackedTarball_get_clean_target,%) :
 			$(call gb_UnpackedTarball_get_final_target,$*) \
 			$(call gb_UnpackedTarball_get_target,$*) \
 			$(call gb_UnpackedTarball_get_preparation_target,$*) \
-			$(call gb_UnpackedTarball_get_dir,$*) \
+			$(gb_UnpackedTarball_workdir)/$* \
 			$(call gb_UnpackedTarball_get_pristine_dir,$*) \
 	)
 
@@ -229,14 +229,14 @@ endef
 #
 # gb_UnpackedTarball_fix_end_of_line unpacked file(s)
 define gb_UnpackedTarball_fix_end_of_line
-$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_FIX_EOL += $(addprefix $(call gb_UnpackedTarball_get_dir,$(1))/,$(2))
+$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_FIX_EOL += $(addprefix $(gb_UnpackedTarball_workdir)/$(1)/,$(2))
 
 endef
 
 
 # Internal version of set_tarball, mostly to avoid repeated invocation of $(shell
 define gb_UnpackedTarball_set_tarball_internal
-$(call gb_UnpackedTarget_UnpackedTarget,$(2),$(call gb_UnpackedTarball_get_dir,$(1)),$(3),$(4))
+$(call gb_UnpackedTarget_UnpackedTarget,$(2),$(gb_UnpackedTarball_workdir)/$(1),$(3),$(4))
 $(call gb_UnpackedTarball_get_target,$(1)) : $(call gb_UnpackedTarget_get_target,$(2))
 $(call gb_UnpackedTarball_get_clean_target,$(1)) : $(call gb_UnpackedTarget_get_clean_target,$(2))
 $(call gb_UnpackedTarget_get_target,$(2)) : $(call gb_UnpackedTarball_get_preparation_target,$(1))
@@ -247,7 +247,7 @@ $(if $(findstring out,$(5)),$(call gb_Module_get_target,$(4)) : $(TARFILE_LOCATI
 $(TARFILE_LOCATION)/$(6) : $(call gb_Module_get_nonl10n_target,$(4))
 	$$(call gb_Output_announce,$(6),$(true),PKB,3)
 	$$(call gb_Trace_StartRange,$(6),PKB)
-	if test ! -f "$$@" ; then cd $(call gb_UnpackedTarball_get_dir,) && $(GNUTAR) -czf "$$@" $(1)/ || $(GNUTAR) -czf "$$@" $(1)/ ; else touch "$$@" ; fi
+	if test ! -f "$$@" ; then cd $(gb_UnpackedTarball_workdir)/ && $(GNUTAR) -czf "$$@" $(1)/ || $(GNUTAR) -czf "$$@" $(1)/ ; else touch "$$@" ; fi
 	$$(call gb_Trace_EndRange,$(6),PKB)
 )
 
@@ -314,7 +314,7 @@ endef
 # gb_UnpackedTarball_add_file unpacked destfile file
 define gb_UnpackedTarball_add_file
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_FILES += $(SRCDIR)/$(3)
-$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_DESTFILES += $(call gb_UnpackedTarball_get_dir,$(1))/$(2)
+$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_DESTFILES += $(gb_UnpackedTarball_workdir)/$(1)/$(2)
 $(call gb_UnpackedTarball_get_preparation_target,$(1)) : $(SRCDIR)/$(3)
 
 endef
@@ -363,7 +363,7 @@ $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_POST_ACTION := $(strip $(2
 endef
 
 define gb_UnpackedTarbal__make_pattern_rule
-$(call gb_UnpackedTarball_get_dir,$(1))/%$(2) :
+$(gb_UnpackedTarball_workdir)/$(1)/%$(2) :
 	$$(if $$(wildcard $$@),,$$(call gb_Output_error,file $$@ does not exist in the tarball))
 	$$(if $$(UNPACKED_MODE),chmod $$(UNPACKED_MODE) $$@ &&) \
 	touch $$@
@@ -378,7 +378,7 @@ $(if $(filter $(2),$(gb_UnpackedTarball_PATTERN_RULES_$(1))),,$(call gb_Unpacked
 endef
 
 define gb_UnpackedTarbal__make_file_rule
-$(call gb_UnpackedTarball_get_dir,$(1))/$(2) :
+$(gb_UnpackedTarball_workdir)/$(1)/$(2) :
 	$$(if $$(wildcard $$@),,$$(call gb_Output_error,file $$@ does not exist in the tarball))
 	$$(if $$(UNPACKED_MODE),chmod $$(UNPACKED_MODE) $$@ &&) \
 	touch $$@
@@ -395,9 +395,9 @@ endef
 #
 # gb_UnpackedTarball_mark_output_file unpacked file
 define gb_UnpackedTarball_mark_output_file
-$(call gb_UnpackedTarball_get_final_target,$(1)) : $(call gb_UnpackedTarball_get_dir,$(1))/$(2)
-$(call gb_UnpackedTarball_get_dir,$(1))/$(2) : $(call gb_UnpackedTarball_get_target,$(1))
-$(call gb_UnpackedTarball_get_dir,$(1))/$(2) : UNPACKED_MODE := 644
+$(call gb_UnpackedTarball_get_final_target,$(1)) : $(gb_UnpackedTarball_workdir)/$(1)/$(2)
+$(gb_UnpackedTarball_workdir)/$(1)/$(2) : $(call gb_UnpackedTarball_get_target,$(1))
+$(gb_UnpackedTarball_workdir)/$(1)/$(2) : UNPACKED_MODE := 644
 $(if $(suffix $(2)),\
 	$(call gb_UnpackedTarbal__ensure_pattern_rule,$(1),$(suffix $(2))),\
 	$(call gb_UnpackedTarbal__make_file_rule,$(1),$(2)) \
@@ -440,10 +440,10 @@ endef
 	fi
 
 %.genpatch :
-	if [ -d $(call gb_UnpackedTarball_get_dir,$*) -a -d  $(call gb_UnpackedTarball_get_pristine_dir,$*) ] ; then \
+	if [ -d $(gb_UnpackedTarball_workdir)/$* -a -d  $(call gb_UnpackedTarball_get_pristine_dir,$*) ] ; then \
 		( \
 		    patch_file=$$(pwd)/$*.new.patch.1; \
-			cd $(call gb_UnpackedTarball_get_dir,) ; \
+			cd $(gb_UnpackedTarball_workdir)/ ; \
 			diff -ur $*.org $* > $$patch_file; \
 		    echo "Patch $$patch_file generated" ; \
 		); \
diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk
index ec31c9691c26..f35ea1d5b08d 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -32,13 +32,13 @@ $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/Module1.xba,$(SRCD
 $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/script.xlb,$(SRCDIR)/swext/mediawiki/dialogs/script.xlb))
 $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/dialog.xlb,$(SRCDIR)/swext/mediawiki/dialogs/dialog.xlb))
 $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/SendToMediaWiki.xdl,$(SRCDIR)/swext/mediawiki/dialogs/SendToMediaWiki.xdl))
-$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/cmarkup.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/cmarkup.xsl))
-$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/entities.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/entities.xsl))
-$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/glayout.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/glayout.xsl))
-$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/mmltex.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/mmltex.xsl))
-$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/scripts.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/scripts.xsl))
-$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/tables.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/tables.xsl))
-$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/tokens.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/tokens.xsl))
+$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/cmarkup.xsl,$(gb_UnpackedTarball_workdir)/xsltml/cmarkup.xsl))
+$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/entities.xsl,$(gb_UnpackedTarball_workdir)/xsltml/entities.xsl))
+$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/glayout.xsl,$(gb_UnpackedTarball_workdir)/xsltml/glayout.xsl))
+$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/mmltex.xsl,$(gb_UnpackedTarball_workdir)/xsltml/mmltex.xsl))
+$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/scripts.xsl,$(gb_UnpackedTarball_workdir)/xsltml/scripts.xsl))
+$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/tables.xsl,$(gb_UnpackedTarball_workdir)/xsltml/tables.xsl))
+$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/tokens.xsl,$(gb_UnpackedTarball_workdir)/xsltml/tokens.xsl))
 $(eval $(call gb_Extension_add_file,wiki-publisher,filter/odt2mediawiki.xsl,$(SRCDIR)/swext/mediawiki/src/filter/odt2mediawiki.xsl))
 $(eval $(call gb_Extension_add_file,wiki-publisher,license/THIRDPARTYLICENSEREADME.html,$(SRCDIR)/swext/mediawiki/src/THIRDPARTYLICENSEREADME.html))
 $(eval $(call gb_Extension_add_file,wiki-publisher,templates/MediaWiki/mediawiki.ott,$(SRCDIR)/swext/mediawiki/src/filter/mediawiki.ott))
diff --git a/winaccessibility/CustomTarget_ia2_idl.mk b/winaccessibility/CustomTarget_ia2_idl.mk
index c30f16cc7ff8..14456227ce49 100644
--- a/winaccessibility/CustomTarget_ia2_idl.mk
+++ b/winaccessibility/CustomTarget_ia2_idl.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,winaccessibility/ia2/idl))
 
-iaccessible2_DIR := $(call gb_UnpackedTarball_get_dir,IAccessible2)
+iaccessible2_DIR := $(gb_UnpackedTarball_workdir)/IAccessible2
 wina11y_COMIDLDIR := $(gb_CustomTarget_workdir)/winaccessibility/ia2/idl
 wina11y_SOURCE := $(SRCDIR)/winaccessibility/source/UAccCOMIDL
 
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
index 4a616cf18deb..4dc5b9dd226c 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_Library_set_include,xsec_xmlsec,\
 	-I$(SRCDIR)/xmlsecurity/inc \
 	-I$(SRCDIR)/xmlsecurity/source/gpg \
 	-I$(SRCDIR)/xmlsecurity/source/xmlsec \
-	-I$(call gb_UnpackedTarball_get_dir,xmlsec/include) \
+	-I$(gb_UnpackedTarball_workdir)/xmlsec/include \
 ))
 
 $(eval $(call gb_Library_use_custom_headers,xsec_xmlsec,\
@@ -93,8 +93,8 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
 ))
 
 $(eval $(call gb_Library_add_libs,xsec_xmlsec,\
-	$(call gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec-mscng.lib \
-	$(call gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec.lib \
+	$(gb_UnpackedTarball_workdir)/xmlsec/win32/binaries/libxmlsec-mscng.lib \
+	$(gb_UnpackedTarball_workdir)/xmlsec/win32/binaries/libxmlsec.lib \
 ))
 
 $(eval $(call gb_Library_use_system_win32_libs,xsec_xmlsec,\
@@ -132,7 +132,7 @@ else # !$(OS),WNT
 
 ifeq ($(SYSTEM_XMLSEC),)
 $(eval $(call gb_Library_add_libs,xsec_xmlsec,\
-       $(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.a \
+       $(gb_UnpackedTarball_workdir)/xmlsec/src/.libs/libxmlsec1.a \
 ))
 endif
 
@@ -140,7 +140,7 @@ ifeq ($(ENABLE_NSS),TRUE)
 
 ifeq ($(SYSTEM_XMLSEC),)
 $(eval $(call gb_Library_add_libs,xsec_xmlsec,\
-    $(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.a \
+    $(gb_UnpackedTarball_workdir)/xmlsec/src/nss/.libs/libxmlsec1-nss.a \
 ))
 endif