diff --git a/build/cxxi.sln b/build/cxxi.sln
index 88d812c3..70974f8f 100644
--- a/build/cxxi.sln
+++ b/build/cxxi.sln
@@ -24,6 +24,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Runtime", "..\src\Runtime\R
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSDL", "..\bin\gen\build\NSDL\NSDL.csproj", "{77BA1CDF-2DA3-451A-8E4A-A9074236140A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Clang", "..\bin\gen\build\Clang\Clang.csproj", "{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -147,6 +149,18 @@ Global
 		{77BA1CDF-2DA3-451A-8E4A-A9074236140A}.Release|Win32.Build.0 = Release|x86
 		{77BA1CDF-2DA3-451A-8E4A-A9074236140A}.Release|x86.ActiveCfg = Release|x86
 		{77BA1CDF-2DA3-451A-8E4A-A9074236140A}.Release|x86.Build.0 = Release|x86
+		{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Release|Any CPU.Build.0 = Release|Any CPU
+		{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Release|Win32.ActiveCfg = Release|Any CPU
+		{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/Generator/Generator.csproj b/src/Generator/Generator.csproj
index 978bc9f5..34adfa63 100644
--- a/src/Generator/Generator.csproj
+++ b/src/Generator/Generator.csproj
@@ -50,6 +50,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Libraries\Clang.cs" />
     <Compile Include="Filter.cs" />
     <Compile Include="Generator.cs" />
     <Compile Include="Glob.cs" />
@@ -57,7 +58,7 @@
     <Compile Include="Options.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SDL.cs" />
+    <Compile Include="Libraries\SDL.cs" />
     <Compile Include="Templates\CSharpModule.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>