diff --git a/build-tools/api-xml-adjuster/api-xml-adjuster.targets b/build-tools/api-xml-adjuster/api-xml-adjuster.targets
index abfddec3569..092c8153c4e 100644
--- a/build-tools/api-xml-adjuster/api-xml-adjuster.targets
+++ b/build-tools/api-xml-adjuster/api-xml-adjuster.targets
@@ -12,13 +12,18 @@
         AdditionalMetadata="ParameterDescription=$(_TopDir)\src\Mono.Android\Profiles\api-%(AndroidApiInfo.Level).params.txt;ClassParseXml=$(_OutputPath)api\api-%(AndroidApiInfo.Level).xml.class-parse;ApiAdjustedXml=$(_OutputPath)api\api-%(AndroidApiInfo.Level).xml.in">
       <Output TaskParameter="Include" ItemName="ApiFileDefinition"/>
     </CreateItem>
+    <ItemGroup>
+      <_ApiParameterDescription Include="%(ApiFileDefinition.ParameterDescription)" />
+      <_ApiClassParseXml        Include="%(ApiFileDefinition.ClassParseXml)" />
+      <_ApiAdjustedXml          Include="%(ApiFileDefinition.ApiAdjustedXml)" />
+    </ItemGroup>
   </Target>
 
   <Target Name="_ClassParse"
       BeforeTargets="_AdjustApiXml"
       DependsOnTargets="_DefineApiFiles"
-      Inputs="%(ApiFileDefinition.ParameterDescription)"
-      Outputs="%(ApiFileDefinition.ClassParseXml)">
+      Inputs="@(_ApiParameterDescription)"
+      Outputs="@(_ApiClassParseXml)">
     <PropertyGroup>
       <ClassParse>$(_TopDir)\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\class-parse.exe</ClassParse>
     </PropertyGroup>
@@ -31,8 +36,8 @@
   <Target Name="_AdjustApiXml"
       AfterTargets="Build"
       DependsOnTargets="_DefineApiFiles"
-      Inputs="%(ApiFileDefinition.ClassParseXml)"
-      Outputs="%(ApiFileDefinition.ApiAdjustedXml)">
+      Inputs="@(_ApiClassParseXml)"
+      Outputs="@(_ApiAdjustedXml)">
     <PropertyGroup>
       <ApiXmlAdjuster>$(_TopDir)\bin\Build$(Configuration)\api-xml-adjuster.exe</ApiXmlAdjuster>
     </PropertyGroup>
diff --git a/src/libzip/libzip.targets b/src/libzip/libzip.targets
index 39fdfdd726e..aa5232e0875 100644
--- a/src/libzip/libzip.targets
+++ b/src/libzip/libzip.targets
@@ -37,9 +37,12 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <_LibZipTargetMakefile Include="$(IntermediateOutputPath)\%(_LibZipTarget.Identity)\Makefile" />
+  </ItemGroup>
   <Target Name="_Make"
       Condition=" '@(_LibZipTarget)' != '' "
-      Inputs="$(IntermediateOutputPath)\%(_LibZipTarget.Identity)\Makefile"
+      Inputs="@(_LibZipTargetMakefile)"
       Outputs="@(Content)">
     <Exec
         Command="make"
diff --git a/src/mono-runtimes/mono-runtimes.targets b/src/mono-runtimes/mono-runtimes.targets
index f3e4a7650d6..9c469f6eaee 100644
--- a/src/mono-runtimes/mono-runtimes.targets
+++ b/src/mono-runtimes/mono-runtimes.targets
@@ -786,14 +786,19 @@
     />
   </Target>
 
+  <ItemGroup>
+    <_MonoCrossRuntimeStamp               Include="$(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)\.stamp" />
+    <_MonoCrossRuntimeIntermediateOutput  Include="$(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)\mono\mini\mono-sgen%(_MonoCrossRuntime.ExeSuffix)" />
+    <_MonoCrossRuntimeOutput              Include="$(_MSBuildDir)\%(_MonoCrossRuntime.InstallPath)%(_MonoCrossRuntime.CrossMonoName)%(_MonoCrossRuntime.ExeSuffix)" />
+  </ItemGroup>
 
   <!-- The condition below is to work around a bug in xbuild which attempts to batch
        even if there are no _MonoCrossRuntime items and the Copy task fails
   -->
   <Target Name="_BuildCrossRuntimes"
       DependsOnTargets="_GenerateCrossOffsetHeaderFiles"
-      Inputs="$(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)\.stamp"
-      Outputs="$(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)\mono\mini\mono-sgen%(_MonoCrossRuntime.ExeSuffix)"
+      Inputs="@(_MonoCrossRuntimeStamp)"
+      Outputs="@(_MonoCrossRuntimeIntermediateOutput)"
       Condition=" '@(_MonoCrossRuntime)' != '' ">
     <Message Text="Building %(_MonoCrossRuntime.Identity) in $(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)"/>
     <Exec
@@ -802,7 +807,7 @@
         WorkingDirectory="$(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)"
     />
     <Touch
-        Files="$(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)\mono\mini\mono-sgen%(_MonoCrossRuntime.ExeSuffix)"
+        Files="@(_MonoCrossRuntimeIntermediateOutput)"
     />
   </Target>
 
@@ -810,8 +815,8 @@
        even if there are no _MonoCrossRuntime items and the Copy task fails
   -->
   <Target Name="_InstallCrossRuntimes"
-      Inputs="$(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)\mono\mini\mono-sgen%(_MonoCrossRuntime.ExeSuffix)"
-      Outputs="$(_MSBuildDir)\%(_MonoCrossRuntime.InstallPath)%(_MonoCrossRuntime.CrossMonoName)%(_MonoCrossRuntime.ExeSuffix)"
+      Inputs="@(_MonoCrossRuntimeIntermediateOutput)"
+      Outputs="@(_MonoCrossRuntimeOutput)"
       Condition=" '@(_MonoCrossRuntime)' != '' ">
     <Copy
         SourceFiles="$(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)\mono\mini\mono-sgen%(_MonoCrossRuntime.ExeSuffix)"
@@ -826,7 +831,7 @@
         Command="&quot;%(_MonoCrossRuntime.Strip)&quot; %(_MonoCrossRuntime.StripFlags) &quot;$(_MSBuildDir)\%(_MonoCrossRuntime.InstallPath)%(_MonoCrossRuntime.CrossMonoName)%(_MonoCrossRuntime.ExeSuffix)&quot;"
     />
     <Touch
-        Files="$(_MSBuildDir)\%(_MonoCrossRuntime.InstallPath)%(_MonoCrossRuntime.CrossMonoName)%(_MonoCrossRuntime.ExeSuffix)"
+        Files="@(_MonoCrossRuntimeOutput)"
     />
   </Target>
   <Target Name="GetMonoBundleItems"