diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
index 8e50ac0a429..4a605731254 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
@@ -65,6 +65,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="$(IntermediateOutputPath)Profile.g.cs" />
     <Compile Include="Linker\LinkModes.cs" />
     <Compile Include="Generator\Generator.cs" />
     <Compile Include="Linker\MonoDroid.Tuner\FixAbstractMethodsStep.cs" />
@@ -532,11 +533,11 @@
     <Compile Include="Utilities\Profile.cs" />
     <None Include="Xamarin.Android.Build.Tasks.targets" />
   </ItemGroup>
-  <Import Project="Xamarin.Android.Build.Tasks.targets" />
   <!-- MD doesn't handle MSBuildToolsPath yet
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   -->
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="Xamarin.Android.Build.Tasks.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets
index ee1a771c4c8..4a0e4956d7d 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets
@@ -9,14 +9,11 @@
     <_SharedRuntimeAssemblies Include="$(_SharedRuntimeBuildPath)v1.0\*.dll;$(_SharedRuntimeBuildPath)$(AndroidFrameworkVersion)\*.dll"/>
   </ItemGroup>
 
-  <Target Name="_GenerateProfileClass" BeforeTargets="CoreCompile"
-	  Inputs="@(_SharedRuntimeAssemblies)"
-	  Outputs="$(_GeneratedProfileClass)"
-	  >
+  <Target Name="_GenerateProfileClass"
+      BeforeTargets="CoreCompile"
+      Inputs="@(_SharedRuntimeAssemblies)"
+      Outputs="$(_GeneratedProfileClass)">
     <GenerateProfile Files="@(_SharedRuntimeAssemblies)" OutputFile="$(_GeneratedProfileClass)" />
-    <ItemGroup>
-        <Compile Include="$(_GeneratedProfileClass)" />
-    </ItemGroup>
     <WriteLinesToFile
         File="$(IntermediateOutputPath)$(CleanFile)"
         Lines="$(_GeneratedProfileClass)"