diff --git a/gdk/gdk.csproj b/gdk/gdk.csproj
index 10cbffb98..1576a459a 100644
--- a/gdk/gdk.csproj
+++ b/gdk/gdk.csproj
@@ -21,6 +21,7 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
     <ConsolePause>false</ConsolePause>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <DebugType>none</DebugType>
@@ -30,6 +31,7 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
     <ConsolePause>false</ConsolePause>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/generator/generator.csproj b/generator/generator.csproj
index d5e852d46..fbab856bb 100644
--- a/generator/generator.csproj
+++ b/generator/generator.csproj
@@ -8,7 +8,7 @@
     <ProjectGuid>{80E73555-2284-40DC-9068-9A40B7359B0C}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>generator</RootNamespace>
-    <AssemblyName>generator</AssemblyName>
+    <AssemblyName>gapi_codegen</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -105,5 +105,6 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
   </ItemGroup>
 </Project>
diff --git a/gio/gio.csproj b/gio/gio.csproj
index 4c31a9328..0033325d7 100644
--- a/gio/gio.csproj
+++ b/gio/gio.csproj
@@ -221,12 +221,10 @@
     <Compile Include="generated\IOStream.cs" />
     <Compile Include="generated\IOStreamAdapter.cs" />
     <Compile Include="generated\IOStreamSpliceFlags.cs" />
-    <Compile Include="generated\Icon.cs" />
     <Compile Include="generated\IconAdapter.cs" />
     <Compile Include="generated\IncomingHandler.cs" />
     <Compile Include="generated\InetAddress.cs" />
     <Compile Include="generated\InetSocketAddress.cs" />
-    <Compile Include="generated\Initable.cs" />
     <Compile Include="generated\InitableAdapter.cs" />
     <Compile Include="generated\InputStream.cs" />
     <Compile Include="generated\InputVector.cs" />
@@ -360,6 +358,14 @@
     <Compile Include="generated\ITlsClientConnection.cs" />
     <Compile Include="generated\ITlsServerConnection.cs" />
     <Compile Include="generated\IVolume.cs" />
+    <Compile Include="generated\IConverter.cs" />
+    <Compile Include="generated\IDrive.cs" />
+    <Compile Include="generated\IFile.cs" />
+    <Compile Include="generated\IFileDescriptorBased.cs" />
+    <Compile Include="generated\IIcon.cs" />
+    <Compile Include="generated\IInitable.cs" />
+    <Compile Include="generated\ILoadableIcon.cs" />
+    <Compile Include="generated\IMount.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\glib\glib.csproj">
diff --git a/glib/glib.csproj b/glib/glib.csproj
index 4a9612cd0..c5f10fc91 100644
--- a/glib/glib.csproj
+++ b/glib/glib.csproj
@@ -94,6 +94,13 @@
     <Compile Include="DateTime.cs" />
     <Compile Include="TimeVal.cs" />
     <Compile Include="TimeZone.cs" />
+    <Compile Include="PollFD.cs" />
+    <Compile Include="SourceCallbackFuncs.cs" />
+    <Compile Include="SourceDummyMarshal.cs" />
+    <Compile Include="SourceFunc.cs" />
+    <Compile Include="SourceFuncs.cs" />
+    <Compile Include="GLibSharp.SourceDummyMarshalNative.cs" />
+    <Compile Include="GLibSharp.SourceFuncNative.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Core" />
diff --git a/gtk/gtk.csproj b/gtk/gtk.csproj
index b5279a883..0b3861d17 100644
--- a/gtk/gtk.csproj
+++ b/gtk/gtk.csproj
@@ -943,5 +943,9 @@
       <Project>{42FE871A-D8CF-4B29-9AFF-B02454E6C976}</Project>
       <Name>atk</Name>
     </ProjectReference>
+    <ProjectReference Include="..\cairo\cairo.csproj">
+      <Project>{364577DB-9728-4951-AC2C-EDF7A6FCC09D}</Project>
+      <Name>cairo</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>