diff --git a/src/IKVM.Clang.Sdk.Tests/Project/SharedLibrary1/SharedLibrary1.clangproj b/src/IKVM.Clang.Sdk.Tests/Project/SharedLibrary1/SharedLibrary1.clangproj
index ef66a30..409ced1 100644
--- a/src/IKVM.Clang.Sdk.Tests/Project/SharedLibrary1/SharedLibrary1.clangproj
+++ b/src/IKVM.Clang.Sdk.Tests/Project/SharedLibrary1/SharedLibrary1.clangproj
@@ -4,7 +4,7 @@
         <ProjectGuid>f511e617-3e18-4dc6-9936-8746f3060663</ProjectGuid>
     </PropertyGroup>
     <PropertyGroup>
-        <OutputType>Library</OutputType>
+        <OutputType>Shared</OutputType>
         <TargetIdentifiers>x86_64-pc-windows-msvc;i686-pc-windows-msvc;thumbv7-pc-windows-msvc;aarch64-pc-windows-msvc</TargetIdentifiers>
         <Verbose>true</Verbose>
     </PropertyGroup>
@@ -12,6 +12,9 @@
         <ProjectReference Include="..\SharedLibrary2\SharedLibrary2.clangproj">
             <BuildReference>true</BuildReference>
         </ProjectReference>
+        <ProjectReference Include="..\StaticLibrary1\StaticLibrary1.clangproj">
+            <BuildReference>true</BuildReference>
+        </ProjectReference>
     </ItemGroup>
     <ItemGroup>
         <Compile Include="hello1.c" />
diff --git a/src/IKVM.Clang.Sdk.Tests/Project/SharedLibrary1/hello1.c b/src/IKVM.Clang.Sdk.Tests/Project/SharedLibrary1/hello1.c
index 2339c04..4d8fcf7 100644
--- a/src/IKVM.Clang.Sdk.Tests/Project/SharedLibrary1/hello1.c
+++ b/src/IKVM.Clang.Sdk.Tests/Project/SharedLibrary1/hello1.c
@@ -1,9 +1,11 @@
 #include <hello2.h>
+#include <statichello1.h>
 #include <stdio.h>
 
 #include "hello1.h"
 
 EXPORT void hello1() {
     hello2();
+    statichello1();
     printf(STRING);
 }
diff --git a/src/IKVM.Clang.Sdk.Tests/Project/SharedLibrary2/SharedLibrary2.clangproj b/src/IKVM.Clang.Sdk.Tests/Project/SharedLibrary2/SharedLibrary2.clangproj
index cd05e50..c493c54 100644
--- a/src/IKVM.Clang.Sdk.Tests/Project/SharedLibrary2/SharedLibrary2.clangproj
+++ b/src/IKVM.Clang.Sdk.Tests/Project/SharedLibrary2/SharedLibrary2.clangproj
@@ -4,7 +4,7 @@
         <ProjectGuid>f511e617-3e18-4dc6-9936-8746f3060663</ProjectGuid>
     </PropertyGroup>
     <PropertyGroup>
-        <OutputType>Library</OutputType>
+        <OutputType>Shared</OutputType>
         <TargetIdentifiers>x86_64-pc-windows-msvc;i686-pc-windows-msvc;thumbv7-pc-windows-msvc;aarch64-pc-windows-msvc</TargetIdentifiers>
         <Verbose>true</Verbose>
     </PropertyGroup>
diff --git a/src/IKVM.Clang.Sdk.Tests/Project/StaticLibrary1/StaticLibrary1.clangproj b/src/IKVM.Clang.Sdk.Tests/Project/StaticLibrary1/StaticLibrary1.clangproj
new file mode 100644
index 0000000..f090b41
--- /dev/null
+++ b/src/IKVM.Clang.Sdk.Tests/Project/StaticLibrary1/StaticLibrary1.clangproj
@@ -0,0 +1,16 @@
+<Project>
+    <Import Sdk="IKVM.Clang.Sdk" Version="$(PackageVersion)" Project="Sdk.props" />
+    <PropertyGroup Label="Globals">
+        <ProjectGuid>f511e617-3e18-4dc6-9936-8746f3060663</ProjectGuid>
+    </PropertyGroup>
+    <PropertyGroup>
+        <OutputType>Static</OutputType>
+        <TargetIdentifiers>x86_64-pc-windows-msvc;i686-pc-windows-msvc;thumbv7-pc-windows-msvc;aarch64-pc-windows-msvc</TargetIdentifiers>
+        <Verbose>true</Verbose>
+    </PropertyGroup>
+    <ItemGroup>
+        <Compile Include="statichello1.c" />
+        <Header Include="statichello1.h" />
+    </ItemGroup>
+    <Import Sdk="IKVM.Clang.Sdk" Version="$(PackageVersion)" Project="Sdk.targets" />
+</Project>
\ No newline at end of file
diff --git a/src/IKVM.Clang.Sdk.Tests/Project/StaticLibrary1/statichello1.c b/src/IKVM.Clang.Sdk.Tests/Project/StaticLibrary1/statichello1.c
new file mode 100644
index 0000000..85f260f
--- /dev/null
+++ b/src/IKVM.Clang.Sdk.Tests/Project/StaticLibrary1/statichello1.c
@@ -0,0 +1,5 @@
+#include "statichello1.h"
+
+void statichello1() {
+
+}
diff --git a/src/IKVM.Clang.Sdk.Tests/Project/StaticLibrary1/statichello1.h b/src/IKVM.Clang.Sdk.Tests/Project/StaticLibrary1/statichello1.h
new file mode 100644
index 0000000..e1c1f42
--- /dev/null
+++ b/src/IKVM.Clang.Sdk.Tests/Project/StaticLibrary1/statichello1.h
@@ -0,0 +1 @@
+void statichello1();
diff --git a/src/IKVM.Clang.Sdk.Tests/ProjectTests.cs b/src/IKVM.Clang.Sdk.Tests/ProjectTests.cs
index 12040d7..051e873 100644
--- a/src/IKVM.Clang.Sdk.Tests/ProjectTests.cs
+++ b/src/IKVM.Clang.Sdk.Tests/ProjectTests.cs
@@ -125,7 +125,8 @@ public static void ClassInitialize(TestContext context)
             options.TargetsToBuild.Clear();
             options.TargetsToBuild.Add("Clean");
             options.TargetsToBuild.Add("Restore");
-            options.Arguments.Add("/v:d");
+            options.Arguments.Add("/v:diag");
+
             var result = analyzer.Build(options);
             context.AddResultFile(Path.Combine(WorkRoot, "msbuild.binlog"));
             result.OverallSuccess.Should().Be(true);
@@ -167,21 +168,21 @@ public void CanBuildTestProject(EnvironmentPreference env, string tid, string li
             options.TargetsToBuild.Clear();
             options.TargetsToBuild.Add("Clean");
             options.TargetsToBuild.Add("Build");
-            options.Arguments.Add("/v:d");
+            options.Arguments.Add("/v:diag");
 
             var result = analyzer.Build(options);
             TestContext.AddResultFile(Path.Combine(WorkRoot, $"{tid}-msbuild.binlog"));
             result.OverallSuccess.Should().BeTrue();
 
-            var binDir = Path.Combine(TestRoot, "Executable", "dist", "Debug", tid, "bin"); 
+            var binDir = Path.Combine(TestRoot, "Executable", "bin", "Debug", tid);
             File.Exists(Path.Combine(binDir, string.Format(exeName, "Executable"))).Should().BeTrue();
             File.Exists(Path.Combine(binDir, string.Format(symName, "Executable"))).Should().BeTrue();
 
-            var libDir1 = Path.Combine(TestRoot, "SharedLibrary1", "dist", "Debug", tid, "lib");
+            var libDir1 = Path.Combine(TestRoot, "SharedLibrary1", "bin", "Debug", tid);
             File.Exists(Path.Combine(libDir1, string.Format(libName, "SharedLibrary1"))).Should().BeTrue();
             File.Exists(Path.Combine(libDir1, string.Format(symName, "SharedLibrary1"))).Should().BeTrue();
 
-            var libDir2 = Path.Combine(TestRoot, "SharedLibrary2", "dist", "Debug", tid, "lib");
+            var libDir2 = Path.Combine(TestRoot, "SharedLibrary2", "bin", "Debug", tid);
             File.Exists(Path.Combine(libDir2, string.Format(libName, "SharedLibrary2"))).Should().BeTrue();
             File.Exists(Path.Combine(libDir2, string.Format(symName, "SharedLibrary2"))).Should().BeTrue();
         }
diff --git a/src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.Core.targets b/src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.Core.targets
index 84d48e2..4305841 100644
--- a/src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.Core.targets
+++ b/src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.Core.targets
@@ -4,59 +4,82 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <OutputType Condition=" '$(OutputType)' == '' ">Library</OutputType>
+        <TargetName Condition=" '$(TargetName)' == '' ">$(MSBuildProjectName)</TargetName>
+        <OutputType Condition=" '$(OutputType)' == '' ">Shared</OutputType>
         <TargetTriple Condition=" '$(TargetTriple)' == '' ">$(TargetIdentifier)</TargetTriple>
         <ClangToolExe Condition=" '$(ClangToolName)' == '' And !$([MSBuild]::IsOSUnixLike())">clang.exe</ClangToolExe>
         <ClangToolExe Condition=" '$(ClangToolName)' == '' And  $([MSBuild]::IsOSUnixLike())">clang</ClangToolExe>
-        <UseLld Condition=" '$(UseLld)' == '' ">true</UseLld>
         <DebugSymbols Condition=" '$(DebugSymbols)' == '' And '$(Configuration)' == 'Debug' ">true</DebugSymbols>
+        <DebugSymbolsExt Condition=" '$(DebugSymbolsExt)' == '' And $(TargetTriple.Contains('-windows-')) ">.pdb</DebugSymbolsExt>
+        <DebugSymbolsExt Condition=" '$(DebugSymbolsExt)' == '' And $(TargetTriple.Contains('-linux-')) ">.g</DebugSymbolsExt>
+        <DebugSymbolsExt Condition=" '$(DebugSymbolsExt)' == '' And $(TargetTriple.Contains('-apple-')) ">.dsym</DebugSymbolsExt>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(OutputType)' == 'exe' ">
-        <TargetPrefix Condition=" '$(TargetPrefix)' == '' "></TargetPrefix>
-        <TargetExt Condition=" '$(TargetExt)' == '' And '$(OutputType)' == 'exe' And $(TargetTriple.Contains('-windows-'))">.exe</TargetExt>
+        <ExecutablePrefix Condition=" '$(ExecutablePrefix)' == '' "></ExecutablePrefix>
+        <ExecutableExt Condition=" '$(ExecutableExt)' == '' And '$(OutputType)' == 'exe' And $(TargetTriple.Contains('-windows-'))">.exe</ExecutableExt>
+        <ExecutableExt Condition=" '$(ExecutableExt)' == '' "></ExecutableExt>
+        <ExecutableExt Condition=" '$(ExecutableExt)' == '' And $(TargetTriple.Contains('-windows-'))">.dll</ExecutableExt>
+        <ExecutableExt Condition=" '$(ExecutableExt)' == '' And $(TargetTriple.Contains('-linux-'))">.so</ExecutableExt>
+        <ExecutableExt Condition=" '$(ExecutableExt)' == '' And $(TargetTriple.Contains('-apple-'))">.dylib</ExecutableExt>
+        <ExecutableFileName Condition=" '$(ExecutableFileName)' == '' ">$(ExecutablePrefix)$(TargetName)$(ExecutableExt)</ExecutableFileName>
+        <ExecutableIntermediateOutputPath Condition=" '$(ExecutableFileName)' != '' ">$(IntermediateOutputPath)$(ExecutableFileName)</ExecutableIntermediateOutputPath>
+        <DebugSymbolsPrefix Condition=" '$(DebugSymbolsPrefix)' == '' "></DebugSymbolsPrefix>
         <Subsystem Condition=" '$(Subsystem)' == '' And $(TargetTriple.Contains('-windows-')) ">console</Subsystem>
         <CopyProjectReferenceOutputToOutput Condition=" '$(CopyProjectReferenceOutputToOutput)' == '' ">true</CopyProjectReferenceOutputToOutput>
+        <UseLd Condition=" '$(UseLd)' == '' ">lld</UseLd>
     </PropertyGroup>
 
-    <PropertyGroup Condition=" '$(OutputType)' == 'library' ">
-        <TargetPrefix Condition=" '$(TargetPrefix)' == '' "></TargetPrefix>
-        <TargetPrefix Condition=" '$(TargetPrefix)' == '' And $(TargetTriple.Contains('-linux-')) ">lib</TargetPrefix>
-        <TargetPrefix Condition=" '$(TargetPrefix)' == '' And $(TargetTriple.Contains('-apple-')) ">lib</TargetPrefix>
-        <TargetExt Condition=" '$(TargetExt)' == '' And $(TargetTriple.Contains('-windows-')) ">.dll</TargetExt>
-        <TargetExt Condition=" '$(TargetExt)' == '' And $(TargetTriple.Contains('-linux-')) ">.so</TargetExt>
-        <TargetExt Condition=" '$(TargetExt)' == '' And $(TargetTriple.Contains('-apple-')) ">.dylib</TargetExt>
+    <PropertyGroup Condition=" '$(OutputType)' == 'shared' ">
+        <ExecutablePrefix Condition=" '$(ExecutablePrefix)' == '' "></ExecutablePrefix>
+        <ExecutablePrefix Condition=" '$(ExecutablePrefix)' == '' And $(TargetTriple.Contains('-windows-'))"></ExecutablePrefix>
+        <ExecutablePrefix Condition=" '$(ExecutablePrefix)' == '' And $(TargetTriple.Contains('-linux-'))">lib</ExecutablePrefix>
+        <ExecutablePrefix Condition=" '$(ExecutablePrefix)' == '' And $(TargetTriple.Contains('-apple-'))">lib</ExecutablePrefix>
+        <ExecutableExt Condition=" '$(ExecutableExt)' == '' "></ExecutableExt>
+        <ExecutableExt Condition=" '$(ExecutableExt)' == '' And $(TargetTriple.Contains('-windows-'))">.dll</ExecutableExt>
+        <ExecutableExt Condition=" '$(ExecutableExt)' == '' And $(TargetTriple.Contains('-linux-'))">.so</ExecutableExt>
+        <ExecutableExt Condition=" '$(ExecutableExt)' == '' And $(TargetTriple.Contains('-apple-'))">.dylib</ExecutableExt>
+        <ExecutableFileName Condition=" '$(ExecutableFileName)' == '' ">$(ExecutablePrefix)$(TargetName)$(ExecutableExt)</ExecutableFileName>
+        <ExecutableIntermediateOutputPath Condition=" '$(ExecutableFileName)' != '' ">$(IntermediateOutputPath)$(ExecutableFileName)</ExecutableIntermediateOutputPath>
+        <LibraryPrefix Condition=" '$(LibraryPrefix)' == '' And $(TargetTriple.Contains('-linux-')) ">lib</LibraryPrefix>
+        <LibraryPrefix Condition=" '$(LibraryPrefix)' == '' And $(TargetTriple.Contains('-apple-')) ">lib</LibraryPrefix>
+        <LibraryExt Condition=" '$(LibraryExt)' == '' And $(TargetTriple.Contains('-windows-')) ">.lib</LibraryExt>
+        <LibraryExt Condition=" '$(LibraryExt)' == '' And $(TargetTriple.Contains('-linux-')) ">.so</LibraryExt>
+        <LibraryExt Condition=" '$(LibraryExt)' == '' And $(TargetTriple.Contains('-apple-')) ">.dylib</LibraryExt>
+        <LibraryFileName Condition=" '$(LibraryFileName)' == '' ">$(LibraryPrefix)$(TargetName)$(LibraryExt)</LibraryFileName>
+        <LibraryIntermediateOutputPath Condition=" '$(LibraryFileName)' != '' ">$(IntermediateOutputPath)$(LibraryFileName)</LibraryIntermediateOutputPath>
+        <DebugSymbolsPrefix Condition=" '$(DebugSymbolsPrefix)' == '' And $(TargetTriple.Contains('-linux-')) ">lib</DebugSymbolsPrefix>
+        <DebugSymbolsPrefix Condition=" '$(DebugSymbolsPrefix)' == '' And $(TargetTriple.Contains('-apple-')) ">lib</DebugSymbolsPrefix>
         <CopyProjectReferenceOutputToOutput Condition=" '$(CopyProjectReferenceOutputToOutput)' == '' ">false</CopyProjectReferenceOutputToOutput>
+        <UseLd Condition=" '$(UseLd)' == '' ">lld</UseLd>
     </PropertyGroup>
 
-    <PropertyGroup>
-        <ObjectExt Condition=" '$(ObjectExt)' == '' And $(TargetTriple.Contains('-windows-')) ">.obj</ObjectExt>
-        <ObjectExt Condition=" '$(ObjectExt)' == '' ">.o</ObjectExt>
-    </PropertyGroup>
-
-    <PropertyGroup>
+    <PropertyGroup Condition=" '$(OutputType)' == 'static' ">
+        <ExecutablePrefix Condition=" '$(ExecutablePrefix)' == '' "></ExecutablePrefix>
+        <ExecutableExt Condition=" '$(ExecutableExt)' == '' "></ExecutableExt>
+        <ExecutableFileName Condition=" '$(ExecutableFileName)' == '' "></ExecutableFileName>
+        <ExecutableIntermediateOutputPath Condition=" '$(ExecutableFileName)' != '' ">$(IntermediateOutputPath)$(ExecutableFileName)</ExecutableIntermediateOutputPath>
+        <LibraryPrefix Condition=" '$(LibraryPrefix)' == '' And $(TargetTriple.Contains('-linux-')) ">lib</LibraryPrefix>
+        <LibraryPrefix Condition=" '$(LibraryPrefix)' == '' And $(TargetTriple.Contains('-apple-')) ">lib</LibraryPrefix>
         <LibraryExt Condition=" '$(LibraryExt)' == '' And $(TargetTriple.Contains('-windows-')) ">.lib</LibraryExt>
-        <LibraryExt Condition=" '$(LibraryExt)' == '' ">.a</LibraryExt>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <DebugSymbolsExt Condition=" '$(DebugSymbolsExt)' == '' And $(TargetTriple.Contains('-windows-')) ">.pdb</DebugSymbolsExt>
-        <DebugSymbolsExt Condition=" '$(DebugSymbolsExt)' == '' And $(TargetTriple.Contains('-linux-')) ">.g</DebugSymbolsExt>
-        <DebugSymbolsExt Condition=" '$(DebugSymbolsExt)' == '' And $(TargetTriple.Contains('-apple-')) ">.dsym</DebugSymbolsExt>
+        <LibraryExt Condition=" '$(LibraryExt)' == '' And $(TargetTriple.Contains('-linux-')) ">.a</LibraryExt>
+        <LibraryExt Condition=" '$(LibraryExt)' == '' And $(TargetTriple.Contains('-apple-')) ">.a</LibraryExt>
+        <LibraryFileName Condition=" '$(LibraryFileName)' == '' ">$(LibraryPrefix)$(TargetName)$(LibraryExt)</LibraryFileName>
+        <LibraryIntermediateOutputPath Condition=" '$(LibraryFileName)' != '' ">$(IntermediateOutputPath)$(LibraryFileName)</LibraryIntermediateOutputPath>
+        <DebugSymbolsPrefix Condition=" '$(DebugSymbolsPrefix)' == '' And $(TargetTriple.Contains('-linux-')) ">lib</DebugSymbolsPrefix>
+        <DebugSymbolsPrefix Condition=" '$(DebugSymbolsPrefix)' == '' And $(TargetTriple.Contains('-apple-')) ">lib</DebugSymbolsPrefix>
+        <CopyProjectReferenceOutputToOutput Condition=" '$(CopyProjectReferenceOutputToOutput)' == '' ">false</CopyProjectReferenceOutputToOutput>
+        <UseLd Condition=" '$(UseLd)' == '' And $(TargetTriple.Contains('-windows-'))">llvm-lib</UseLd>
+        <UseLd Condition=" '$(UseLd)' == '' ">lld</UseLd>
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetName Condition=" '$(TargetName)' == '' ">$(ProjectName)</TargetName>
-        <TargetFileName Condition=" '$(TargetFileName)' == '' ">$(TargetPrefix)$(TargetName)$(TargetExt)</TargetFileName>
-        <LibraryFileName Condition=" '$(LibraryFileName)' == '' And '$(LibraryExt)' != '' ">$(TargetPrefix)$(TargetName)$(LibraryExt)</LibraryFileName>
-        <DebugSymbolsFileName Condition=" '$(DebugSymbolsFileName)' == '' And '$(DebugSymbolsExt)' != '' ">$(TargetPrefix)$(TargetName)$(DebugSymbolsExt)</DebugSymbolsFileName>
-
-        <!-- output libraries and binaries to different directories -->
-        <LibraryPathName Condition=" '$(LibraryPathName)' == '' ">lib\</LibraryPathName>
-        <BinaryPathName Condition=" '$(BinaryPathName)' == '' ">bin\</BinaryPathName>
-        <IncludePathName Condition=" '$(IncludePathName)' == '' ">include\</IncludePathName>
-        <TargetPathName Condition=" '$(OutputType)' == 'library' ">$(LibraryPathName)</TargetPathName>
-        <TargetPathName Condition=" '$(OutputType)' == 'exe' ">$(BinaryPathName)</TargetPathName>
+        <ObjectExt Condition=" '$(ObjectExt)' == '' And $(TargetTriple.Contains('-windows-')) ">.obj</ObjectExt>
+        <ObjectExt Condition=" '$(ObjectExt)' == '' ">.o</ObjectExt>
+        <DebugSymbolsFileName Condition=" '$(DebugSymbolsFileName)' == '' ">$(DebugSymbolsPrefix)$(TargetName)$(DebugSymbolsExt)</DebugSymbolsFileName>
+        <DebugSymbolsIntermediateOutputPath Condition=" '$(DebugSymbolsFileName)' != '' ">$(IntermediateOutputPath)$(DebugSymbolsFileName)</DebugSymbolsIntermediateOutputPath>
+        <HeadersPathName Condition=" '$(HeadersPathName)' == '' ">headers\</HeadersPathName>
+        <HeadersIntermediateOutputPath Condition=" '$(HeadersPathName)' != '' ">$(IntermediateOutputPath)$(HeadersPathName)</HeadersIntermediateOutputPath>
     </PropertyGroup>
 
     <!--
@@ -87,9 +110,6 @@
                 <BuildReference Condition="'%(ProjectReferenceWithConfiguration.BuildReference)' == ''">true</BuildReference>
                 <ReferenceTargetItems Condition="'%(ProjectReferenceWithConfiguration.ReferenceTargetItems)' == ''">true</ReferenceTargetItems>
                 <CopyTargetItemsLocal Condition="'%(ProjectReferenceWithConfiguration.CopyTargetItemsLocal)' == ''">true</CopyTargetItemsLocal>
-                <ReferenceIncludeDirectories Condition="'%(ProjectReferenceWithConfiguration.ReferenceIncludeDirectories)' == ''">true</ReferenceIncludeDirectories>
-                <ReferenceLibraryDirectories Condition="'%(ProjectReferenceWithConfiguration.ReferenceLibraryDirectories)' == ''">true</ReferenceLibraryDirectories>
-                <ReferenceDependencies Condition="'%(ProjectReferenceWithConfiguration.ReferenceDependencies)' == ''">true</ReferenceDependencies>
             </ProjectReferenceWithConfiguration>
         </ItemGroup>
     </Target>
@@ -134,147 +154,40 @@
 
     <!--
     
-    GetClangTargetItem
+    GetTargetItem
     
     Externally callable target that returns information about the native target being built.
     
     -->
 
-    <Target Name="GetClangTargetItem" Returns="@(GetClangTargetItem)">
+    <Target Name="GetTargetItem" Returns="@(GetTargetItem)">
         <ItemGroup>
-            <GetClangTargetItem Include="$([System.IO.Path]::GetFullPath('$(OutputPath)$(TargetPathName)$(TargetFileName)'))">
+            <GetTargetItem Include="$([System.IO.Path]::GetFullPath('$(OutputPath)$(TargetPathName)$(TargetFileName)'))">
                 <TargetIdentifier>$(TargetIdentifier)</TargetIdentifier>
                 <TargetName>$(TargetName)</TargetName>
                 <TargetTriple>$(TargetTriple)</TargetTriple>
-                <LibraryPath>$([System.IO.Path]::GetFullPath('$(OutputPath)$(LibraryPathName)$(LibraryFileName)'))</LibraryPath>
-                <DebugSymbolsPath>$([System.IO.Path]::GetFullPath('$(OutputPath)$(TargetPathName)$(DebugSymbolsFileName)'))</DebugSymbolsPath>
-                <IncludePath>$([System.IO.Path]::GetFullPath('$(OutputPath)$(IncludePathName)'))</IncludePath>
+                <ExecutablePath Condition=" '$(ExecutableIntermediateOutputPath)' != '' ">$([System.IO.Path]::GetFullPath('$(ExecutableIntermediateOutputPath)'))</ExecutablePath>
+                <LibraryPath Condition=" '$(LibraryIntermediateOutputPath)' != '' ">$([System.IO.Path]::GetFullPath('$(LibraryIntermediateOutputPath)'))</LibraryPath>
+                <DebugSymbolsPath Condition=" '$(DebugSymbolsIntermediateOutputPath)' != '' ">$([System.IO.Path]::GetFullPath('$(DebugSymbolsIntermediateOutputPath)'))</DebugSymbolsPath>
+                <HeadersPath Condition=" '$(HeadersIntermediateOutputPath)' != '' ">$([System.IO.Path]::GetFullPath('$(HeadersIntermediateOutputPath)'))</HeadersPath>
                 <Version>$(Version)</Version>
                 <CopyUpToDateMarker>@(CopyUpToDateMarker)</CopyUpToDateMarker>
-            </GetClangTargetItem>
+            </GetTargetItem>
         </ItemGroup>
     </Target>
 
     <!--
     
-    GetTransitiveClangTargetItems
+    GetProjectReferenceTargetItems
     
     Externally callable target that returns information about the native target being built and the same for any dependent project references.
     
     -->
 
-    <Target Name="GetTransitiveClangTargetItems" DependsOnTargets="AssignProjectConfiguration" Returns="@(GetTransitiveClangTargetItems)">
-        <MSBuild
-            Projects="@(ProjectReferenceWithConfiguration)"
-            Targets="GetClangTargetItem;GetTransitiveClangTargetItems"
-            SkipNonexistentTargets="true"
-            BuildInParallel="$(BuildInParallel)"
-            Properties="%(ProjectReferenceWithConfiguration.SetConfiguration);%(ProjectReferenceWithConfiguration.SetPlatform);%(ProjectReferenceWithConfiguration.SetTargetIdentifier);"
-            Condition="'%(ProjectReferenceWithConfiguration.BuildReference)' == 'true' And '@(ProjectReferenceWithConfiguration)' != '' And ('$(BuildingInsideVisualStudio)' == 'true' Or '$(BuildProjectReferences)' != 'true') And '$(VisualStudioVersion)' != '10.0' And '@(ProjectReferenceWithConfiguration)' != ''"
-            ContinueOnError="false"
-            RemoveProperties="%(ProjectReferenceWithConfiguration.GlobalPropertiesToRemove)$(_GlobalPropertiesToRemoveFromProjectReferences)"
-            RebaseOutputs="false">
-            <Output TaskParameter="TargetOutputs" ItemName="_GetTransitiveTargetItems" Condition=" '%(ProjectReferenceWithConfiguration.ReferenceTargetItems)' == 'true' "/>
-        </MSBuild>
-        <RemoveDuplicates Inputs="@(_GetTransitiveTargetItems)">
-            <Output TaskParameter="Filtered" ItemName="__GetTransitiveTargetItems"/>
-        </RemoveDuplicates>
-        <ItemGroup>
-            <GetTransitiveTargetItems Include="@(__GetTransitiveTargetItems)" />
-        </ItemGroup>
-    </Target>
-
-    <!--
-    
-    GetClangIncludeDirectories
-    
-    Externally callable target that returns the include directory information about the target being built and the same for any dependent project references.
-    
-    -->
-
-    <Target Name="GetClangIncludeDirectories" Returns="@(GetClangIncludeDirectories)">
-        <ItemGroup>
-            <GetClangIncludeDirectories Include="$(IncludeDirectories)" />
-            <GetClangIncludeDirectories Include="@(IncludeDirectories)" />
-        </ItemGroup>
-    </Target>
-
-    <Target Name="GetTransitiveClangIncludeDirectories" DependsOnTargets="AssignProjectConfiguration" Returns="@(GetTransitiveClangIncludeDirectories)">
-        <MSBuild
-            Projects="@(ProjectReferenceWithConfiguration)"
-            Targets="GetClangIncludeDirectories;GetTransitiveClangIncludeDirectories"
-            SkipNonexistentTargets="true"
-            BuildInParallel="$(BuildInParallel)"
-            Properties="%(ProjectReferenceWithConfiguration.SetConfiguration);%(ProjectReferenceWithConfiguration.SetPlatform);%(ProjectReferenceWithConfiguration.SetTargetIdentifier);"
-            Condition="'%(ProjectReferenceWithConfiguration.BuildReference)' == 'true' And '@(ProjectReferenceWithConfiguration)' != '' And ('$(BuildingInsideVisualStudio)' == 'true' Or '$(BuildProjectReferences)' != 'true') And '$(VisualStudioVersion)' != '10.0' And '@(ProjectReferenceWithConfiguration)' != ''"
-            ContinueOnError="false"
-            RemoveProperties="%(ProjectReferenceWithConfiguration.GlobalPropertiesToRemove)$(_GlobalPropertiesToRemoveFromProjectReferences)"
-            RebaseOutputs="true">
-            <Output TaskParameter="TargetOutputs" ItemName="_GetTransitiveIncludeDirectories" Condition=" '%(ProjectReferenceWithConfiguration.ReferenceIncludeDirectories)' == 'true' "/>
-        </MSBuild>
-        <RemoveDuplicates Inputs="@(_GetTransitiveIncludeDirectories)">
-            <Output TaskParameter="Filtered" ItemName="__GetTransitiveIncludeDirectories"/>
-        </RemoveDuplicates>
-        <ItemGroup>
-            <GetTransitiveIncludeDirectories Include="@(__GetTransitiveIncludeDirectories)" />
-        </ItemGroup>
-    </Target>
-
-    <!--
-    
-    GetTransitiveClangLibraryDirectories
-    
-    Externally callable target that returns the library directory information about the target being built and the same for any dependent project references.
-    
-    -->
-
-    <Target Name="GetClangLibraryDirectories" Returns="@(GetClangLibraryDirectories)">
-        <ItemGroup>
-            <GetClangLibraryDirectories Include="$(LibraryDirectories)" />
-            <GetClangLibraryDirectories Include="@(LibraryDirectories)" />
-        </ItemGroup>
-    </Target>
-
-    <Target Name="GetTransitiveClangLibraryDirectories" DependsOnTargets="AssignProjectConfiguration" Returns="@(GetTransitiveClangLibraryDirectories)">
+    <Target Name="GetProjectReferenceTargetItems" DependsOnTargets="AssignProjectConfiguration" Returns="@(GetProjectReferenceTargetItems)">
         <MSBuild
             Projects="@(ProjectReferenceWithConfiguration)"
-            Targets="GetClangLibraryDirectories;GetTransitiveClangLibraryDirectories"
-            SkipNonexistentTargets="true"
-            BuildInParallel="$(BuildInParallel)"
-            Properties="%(ProjectReferenceWithConfiguration.SetConfiguration);%(ProjectReferenceWithConfiguration.SetPlatform);%(ProjectReferenceWithConfiguration.SetTargetIdentifier);"
-            Condition="'%(ProjectReferenceWithConfiguration.BuildReference)' == 'true' And '@(ProjectReferenceWithConfiguration)' != '' And ('$(BuildingInsideVisualStudio)' == 'true' Or '$(BuildProjectReferences)' != 'true') And '$(VisualStudioVersion)' != '10.0' And '@(ProjectReferenceWithConfiguration)' != ''"
-            ContinueOnError="false"
-            RemoveProperties="%(ProjectReferenceWithConfiguration.GlobalPropertiesToRemove)$(_GlobalPropertiesToRemoveFromProjectReferences)"
-            RebaseOutputs="true">
-            <Output TaskParameter="TargetOutputs" ItemName="_GetTransitiveLibraryDirectories" Condition=" '%(ProjectReferenceWithConfiguration.ReferenceLibraryDirectories)' == 'true' "/>
-        </MSBuild>
-        <RemoveDuplicates Inputs="@(_GetTransitiveLibraryDirectories)">
-            <Output TaskParameter="Filtered" ItemName="__GetTransitiveLibraryDirectories"/>
-        </RemoveDuplicates>
-        <ItemGroup>
-            <GetTransitiveLibraryDirectories Include="@(__GetTransitiveLibraryDirectories)" />
-        </ItemGroup>
-    </Target>
-
-    <!--
-    
-    GetTransitiveClangDependencies
-    
-    Externally callable target that returns the dependency information about the target being built and the same for any dependent project references.
-    
-    -->
-
-    <Target Name="GetClangDependencies" Returns="@(GetClangDependencies)">
-        <ItemGroup>
-            <GetClangDependencies Include="$(Dependencies)" />
-            <GetClangDependencies Include="@(Dependencies)" />
-        </ItemGroup>
-    </Target>
-
-    <Target Name="GetTransitiveClangDependencies" DependsOnTargets="AssignProjectConfiguration" Returns="@(GetTransitiveClangDependencies)">
-        <MSBuild
-            Projects="@(ProjectReferenceWithConfiguration)"
-            Targets="GetClangDependencies;GetTransitiveClangDependencies"
+            Targets="GetTargetItem"
             SkipNonexistentTargets="true"
             BuildInParallel="$(BuildInParallel)"
             Properties="%(ProjectReferenceWithConfiguration.SetConfiguration);%(ProjectReferenceWithConfiguration.SetPlatform);%(ProjectReferenceWithConfiguration.SetTargetIdentifier);"
@@ -282,45 +195,38 @@
             ContinueOnError="false"
             RemoveProperties="%(ProjectReferenceWithConfiguration.GlobalPropertiesToRemove)$(_GlobalPropertiesToRemoveFromProjectReferences)"
             RebaseOutputs="false">
-            <Output TaskParameter="TargetOutputs" ItemName="_GetTransitiveDependencies" Condition=" '%(ProjectReferenceWithConfiguration.ReferenceDependencies)' == 'true' "/>
+            <Output TaskParameter="TargetOutputs" ItemName="_GetProjectReferenceTargetItems" Condition=" '%(ProjectReferenceWithConfiguration.ReferenceTargetItems)' == 'true' "/>
         </MSBuild>
-        <RemoveDuplicates Inputs="@(_GetTransitiveDependencies)">
-            <Output TaskParameter="Filtered" ItemName="__GetTransitiveDependencies"/>
+        <RemoveDuplicates Inputs="@(_GetProjectReferenceTargetItems)">
+            <Output TaskParameter="Filtered" ItemName="__GetProjectReferenceTargetItems"/>
         </RemoveDuplicates>
         <ItemGroup>
-            <GetTransitiveDependencies Include="@(__GetTransitiveDependencies)" />
+            <GetProjectReferenceTargetItems Include="@(__GetProjectReferenceTargetItems)" />
         </ItemGroup>
     </Target>
 
     <!--
     
-    ImportTransitiveProjectReferenceItems
+    ImportProjectReferenceItems
     
     Collect any items resolved from ProjectReferences and configure locally.
     
     -->
     <PropertyGroup>
-        <ImportTransitiveProjectReferenceItemsDependsOn>
-            $(ImportTransitiveProjectReferenceItemsDependsOn);
+        <ImportProjectReferenceItemsDependsOn>
+            $(ImportProjectReferenceItemsDependsOn);
             AssignProjectConfiguration;
-            GetTransitiveClangTargetItems;
-            GetTransitiveClangIncludeDirectories;
-            GetTransitiveClangLibraryDirectories;
-            GetTransitiveClangDependencies;
-        </ImportTransitiveProjectReferenceItemsDependsOn>
+            GetProjectReferenceTargetItems;
+        </ImportProjectReferenceItemsDependsOn>
     </PropertyGroup>
 
-    <Target Name="ImportTransitiveProjectReferenceItems" DependsOnTargets="$(ImportTransitiveProjectReferenceItemsDependsOn)">
-        <ItemGroup>
-            <ImportedIncludeDirectories Include="@(GetTransitiveTargetItems->'%(IncludePath)')" />
-            <ImportedIncludeDirectories Include="@(GetTransitiveIncludeDirectories)" />
-        </ItemGroup>
+    <Target Name="ImportProjectReferenceItems" DependsOnTargets="$(ImportProjectReferenceItemsDependsOn)">
         <ItemGroup>
-            <_GetTransitiveTargetItems Include="@(GetTransitiveTargetItems->'%(LibraryPath)')" />
-            <ImportedLibraryDirectories Include="@(_GetTransitiveTargetItems->'%(RootDir)%(Directory)')" />
-            <ImportedLibraryDirectories Include="@(GetTransitiveLibraryDirectories)" />
-            <ImportedDependencies Include="@(GetTransitiveTargetItems->'%(TargetName)')" />
-            <ImportedDependencies Include="@(GetTransitiveDependencies)" />
+            <IncludeDirectories Include="@(GetProjectReferenceTargetItems->'%(HeadersPath)')" />
+            <_LibraryDirectories Remove="@(_LibraryDirectories)" />
+            <_LibraryDirectories Include="@(GetProjectReferenceTargetItems->'%(LibraryPath)')" />
+            <LibraryDirectories Include="@(_LibraryDirectories->'%(RootDir)%(Directory)')" />
+            <Dependencies Include="@(GetProjectReferenceTargetItems->'%(TargetName)')" />
         </ItemGroup>
     </Target>
 
@@ -362,7 +268,7 @@
     
     -->
 
-    <Target Name="PrepareCompile" DependsOnTargets="ImportTransitiveProjectReferenceItems" Condition=" '@(Compile)' != '' ">
+    <Target Name="PrepareCompile" DependsOnTargets="ImportProjectReferenceItems" Condition=" '@(Compile)' != '' ">
         <IkvmClangSdkGenerateUniqueFileName Items="@(Compile)" MetadataName="ObjectPath" Extension="$(ObjectExt)" Directory="$(IntermediateOutputPath)">
             <Output TaskParameter="Items" ItemName="_Compile" />
         </IkvmClangSdkGenerateUniqueFileName>
@@ -385,7 +291,7 @@
         <CoreCompileDependsOn>
             $(CoreCompileDependsOn);
             ResolveProjectReferences;
-            ImportTransitiveProjectReferenceItems;
+            ImportProjectReferenceItems;
             PrepareCompile;
         </CoreCompileDependsOn>
     </PropertyGroup>
@@ -462,7 +368,6 @@
             <_IncludeDirectories Include="%(Compile.IncludeDirectories)" />
             <_IncludeDirectories Include="@(IncludeDirectories)" />
             <_IncludeDirectories Include="$(IncludeDirectories)" />
-            <_IncludeDirectories Include="@(ImportedIncludeDirectories)" />
             <_IncludeDirectoriesTemp Remove="@(_IncludeDirectoriesTemp)" />
             <_IncludeDirectoriesTemp Include="@(_IncludeDirectories->Distinct())" />
             <_IncludeDirectoriesArgs Remove="@(_IncludeDirectoriesArgs)" />
@@ -509,20 +414,25 @@
         <CoreLinkDependsOn>
             $(CoreLinkDependsOn);
             Compile;
-            ImportTransitiveProjectReferenceItems;
+            ImportProjectReferenceItems;
         </CoreLinkDependsOn>
     </PropertyGroup>
 
     <Target Name="CoreLink" DependsOnTargets="$(CoreLinkDependsOn)" Inputs="@(Compile->'%(ObjectPath)')" Outputs="$(IntermediateOutputPath)$(TargetFileName)">
         <MakeDir Directories="$(IntermediateOutputPath)" />
+        
+        <PropertyGroup>
+            <_OutputPath Condition=" '$(LibraryIntermediateOutputPath)' != '' ">$(LibraryIntermediateOutputPath)</_OutputPath>
+            <_OutputPath Condition=" '$(ExecutableIntermediateOutputPath)' != '' ">$(ExecutableIntermediateOutputPath)</_OutputPath>
+        </PropertyGroup>
 
         <ItemGroup>
             <_Args Remove="@(_Args)" />
-            <_Args Include="-shared" Condition=" '$(OutputType)' == 'library' " />
-            <_Args Include="-static" Condition=" '$(OutputType)' == 'staticlibrary' " />
+            <_Args Include="-shared" Condition=" '$(OutputType)' == 'shared' " />
+            <_Args Include="-static" Condition=" '$(OutputType)' == 'static' " />
             <_Args Include="-v" Condition=" '$(Verbose)' == 'true' " />
             <_Args Include="--target" Value="$(TargetTriple)" Separator="=" />
-            <_Args Include="-fuse-ld" Value="lld" Separator="=" Condition=" '$(UseLld)' == 'true' " />
+            <_Args Include="-fuse-ld" Value="$(UseLd)" Separator="=" Condition=" '$(UseLd)' != '' " />
             <_Args Include="-g" Condition=" '$(DebugSymbols)' == 'true' " />
 
             <_Args Include="-Wl,/subsystem:$(Subsystem)" Condition=" '$(Subsystem)' != '' " />
@@ -550,7 +460,6 @@
             <_LibraryDirectories Remove="@(_LibraryDirectories)" />
             <_LibraryDirectories Include="@(LibraryDirectories)" />
             <_LibraryDirectories Include="$(LibraryDirectories)" />
-            <_LibraryDirectories Include="@(ImportedLibraryDirectories)" />
             <_LibraryDirectoriesTemp Remove="@(_LibraryDirectoriesTemp)" />
             <_LibraryDirectoriesTemp Include="@(_LibraryDirectories->Distinct())" />
             <_LibraryDirectoriesArgs Remove="@(_LibraryDirectoriesArgs)" />
@@ -560,7 +469,6 @@
             <_Dependencies Remove="@(_Dependencies)" />
             <_Dependencies Include="@(Dependencies)" />
             <_Dependencies Include="$(Dependencies)" />
-            <_Dependencies Include="@(ImportedDependencies)" />
             <_DependenciesTemp Remove="@(_DependenciesTemp)" />
             <_DependenciesTemp Include="@(_Dependencies->Distinct())" />
             <_DependenciesArgs Remove="@(_DependenciesArgs)" />
@@ -574,19 +482,57 @@
 
             <_Args Include="@(Compile->'%(ObjectPath)')" />
 
-            <_Args Include="-o" Value="$(IntermediateOutputPath)$(TargetFileName)" Separator=" " />
+            <_Args Include="-o" Value="$(_OutputPath)" Separator=" " />
         </ItemGroup>
 
         <ClangExe ToolExe="$(ClangToolExe)" Arguments="@(_Args)" />
 
         <ItemGroup>
-            <FileWrites Include="$(IntermediateOutputPath)$(TargetFileName)" />
-            <FileWrites Include="$(IntermediateOutputPath)$(LibraryFileName)" />
-            <FileWrites Include="$(IntermediateOutputPath)$(DebugSymbolsFileName)" />
+            <FileWrites Include="$(ExecutableIntermediateOutputPath)" />
+            <FileWrites Include="$(LibraryIntermediateOutputPath)" />
+            <FileWrites Include="$(DebugSymbolsIntermediateOutputPath)" />
         </ItemGroup>
 
         <CallTarget Targets="$(TargetsTriggeredByLinking)" Condition="'$(TargetsTriggeredByLinking)' != ''" />
     </Target>
+    
+    <!--
+    
+    CopyHeaders
+    
+    Collect any headers and copy to temp directory.
+    
+    -->
+
+    <Target Name="PrepareCopyHeaders">
+        <ItemGroup>
+            <Header Update="@(Header)">
+                <IncludePath Condition=" '%(Header.IncludePath)' == '' ">%(RecursiveDir)%(Filename)%(Extension)</IncludePath>
+            </Header>
+        </ItemGroup>
+    </Target>
+
+    <PropertyGroup>
+        <CopyHeadersDependsOn>
+            $(CopyHeadersDependsOn);
+            PrepareCopyHeaders;
+        </CopyHeadersDependsOn>
+    </PropertyGroup>
+
+    <Target Name="CopyHeaders" DependsOnTargets="$(CopyHeadersDependsOn)" Inputs="@(Header)" Outputs="@(Header->'$(HeadersIntermediateOutputPath)%(IncludePath)')">
+        <Copy
+            SourceFiles="@(Header)"
+            DestinationFiles="@(Header->'$(HeadersIntermediateOutputPath)%(IncludePath)')"
+            SkipUnchangedFiles="$(SkipCopyUnchangedFiles)"
+            OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
+            Retries="$(CopyRetryCount)"
+            RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
+            UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)"
+            UseSymboliclinksIfPossible="$(CreateSymbolicLinksForCopyFilesToOutputDirectoryIfPossible)"
+            ErrorIfLinkFails="$(ErrorIfLinkFailsForCopyFilesToOutputDirectory)">
+            <Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
+        </Copy>
+    </Target>
 
     <!--
     
@@ -599,30 +545,17 @@
     <PropertyGroup>
         <GetCopyToOutputDirectoryItemsDependsOn>
             $(GetCopyToOutputDirectoryItemsDependsOn);
-            GetTransitiveClangTargetItems;
+            GetProjectReferenceTargetItems;
         </GetCopyToOutputDirectoryItemsDependsOn>
     </PropertyGroup>
 
     <Target Name="GetCopyToOutputDirectoryItems" DependsOnTargets="$(GetCopyToOutputDirectoryItemsDependsOn)" Returns="@(OutputItemsWithTargetPath)">
         <ItemGroup>
-            <OutputItemsWithTargetPath Include="$(IntermediateOutputPath)$(TargetFileName)">
-                <TargetPath>$(TargetPathName)$(TargetFileName)</TargetPath>
-            </OutputItemsWithTargetPath>
-            <OutputItemsWithTargetPath Include="$(IntermediateOutputPath)$(LibraryFileName)" Condition=" '$(LibraryFileName)' != '' And Exists('$(IntermediateOutputPath)$(LibraryFileName)')">
-                <TargetPath>$(LibraryPathName)$(LibraryFileName)</TargetPath>
-            </OutputItemsWithTargetPath>
-            <OutputItemsWithTargetPath Include="$(IntermediateOutputPath)$(DebugSymbolsFileName)" Condition=" '$(DebugSymbolsFileName)' != '' ANd Exists('$(IntermediateOutputPath)$(DebugSymbolsFileName)')">
-                <TargetPath>$(TargetPathName)$(DebugSymbolsFileName)</TargetPath>
-            </OutputItemsWithTargetPath>
-            <OutputItemsWithTargetPath Include="@(Header)" Condition=" '%(Header.CopyToIncludeDirectory)' == 'true' And '%(Header.IncludePath)' != '' ">
-                <TargetPath>$(IncludePathName)%(Header.IncludePath)</TargetPath>
-            </OutputItemsWithTargetPath>
-            <OutputItemsWithTargetPath Include="@(GetTransitiveClangTargetItems)" Condition=" '$(CopyProjectReferenceOutputToOutput)' == 'true' ">
-                <TargetPath>$(TargetPathName)%(Filename)%(Extension)</TargetPath>
+            <OutputItemsWithTargetPath Include="$(ExecutableIntermediateOutputPath)" Condition=" '$(ExecutableIntermediateOutputPath)' != '' And Exists('$(ExecutableIntermediateOutputPath)')">
+                <TargetPath>$(ExecutableFileName)</TargetPath>
             </OutputItemsWithTargetPath>
-            <_DebugSymbolsPathOutputItems Include="@(GetTransitiveClangTargetItems->'%(DebugSymbolsPath)')" Condition=" '%(DebugSymbolsPath)' != '' And Exists('%(DebugSymbolsPath)')" />
-            <OutputItemsWithTargetPath Include="@(_DebugSymbolsPathOutputItems)" Condition=" '$(CopyProjectReferenceOutputToOutput)' == 'true' And '@(_DebugSymbolsPathOutputItems)' != '' ">
-                <TargetPath>$(TargetPathName)%(Filename)%(Extension)</TargetPath>
+            <OutputItemsWithTargetPath Include="$(DebugSymbolsIntermediateOutputPath)" Condition=" '$(DebugSymbolsIntermediateOutputPath)' != '' And Exists('$(DebugSymbolsIntermediateOutputPath)')">
+                <TargetPath>$(DebugSymbolsFileName)</TargetPath>
             </OutputItemsWithTargetPath>
         </ItemGroup>
     </Target>
@@ -632,6 +565,7 @@
             AssignProjectConfiguration;
             Compile;
             Link;
+            CopyHeaders;
             CopyFilesToOutputDirectory;
         </CoreBuildDependsOn>
     </PropertyGroup>
diff --git a/src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.CurrentVersion.targets b/src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.CurrentVersion.targets
index c3e97db..759f56b 100644
--- a/src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.CurrentVersion.targets
+++ b/src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.CurrentVersion.targets
@@ -10,13 +10,13 @@
         <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
         <ConfigurationName Condition="'$(ConfigurationName)' == ''">$(Configuration)</ConfigurationName>
 
-        <BaseOutputPath Condition="'$(BaseOutputPath)' == ''">dist\</BaseOutputPath>
+        <BaseOutputPath Condition="'$(BaseOutputPath)' == ''">bin\</BaseOutputPath>
         <BaseOutputPath Condition="!HasTrailingSlash('$(BaseOutputPath)')">$(BaseOutputPath)\</BaseOutputPath>
         <OutputPath Condition="'$(OutputPath)' == '' and '$(PlatformName)' == 'AnyCPU'">$(BaseOutputPath)$(Configuration)\$(TargetIdentifier.ToLowerInvariant())\</OutputPath>
         <OutputPath Condition="'$(OutputPath)' == '' and '$(PlatformName)' != 'AnyCPU'">$(BaseOutputPath)$(PlatformName)\$(Configuration)\$(TargetIdentifier.ToLowerInvariant())\</OutputPath>
         <OutputPath Condition="!HasTrailingSlash('$(OutputPath)')">$(OutputPath)\</OutputPath>
 
-        <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)' == ''">temp\</BaseIntermediateOutputPath>
+        <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)' == ''">obj\</BaseIntermediateOutputPath>
         <BaseIntermediateOutputPath Condition="!HasTrailingSlash('$(BaseIntermediateOutputPath)')">$(BaseIntermediateOutputPath)\</BaseIntermediateOutputPath>
         <IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == '' and '$(PlatformName)' == 'AnyCPU'">$(BaseIntermediateOutputPath)$(Configuration)\$(TargetIdentifier.ToLowerInvariant())\</IntermediateOutputPath>
         <IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == '' and '$(PlatformName)' != 'AnyCPU'">$(BaseIntermediateOutputPath)$(PlatformName)\$(Configuration)\$(TargetIdentifier.ToLowerInvariant())\</IntermediateOutputPath>
diff --git a/src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.Sdk.targets b/src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.Sdk.targets
index 20847bc..7b5c2ca 100644
--- a/src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.Sdk.targets
+++ b/src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.Sdk.targets
@@ -32,5 +32,4 @@
 
     <Import Project="$(DirectoryBuildTargetsPath)" Condition="'$(ImportDirectoryBuildTargets)' == 'true' and exists('$(DirectoryBuildTargetsPath)')"/>
 
-
 </Project>
diff --git a/src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.props b/src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.props
index 0ce66c6..71040aa 100644
--- a/src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.props
+++ b/src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.props
@@ -21,7 +21,6 @@
     <ItemDefinitionGroup>
         <Header>
             <CopyToIncludeDirectory>true</CopyToIncludeDirectory>
-            <IncludePath>%(RecursiveDir)%(Filename)%(Extension)</IncludePath>
         </Header>
     </ItemDefinitionGroup>