diff --git a/ZuneImpl/Service/CommunityCommerce.oz.cs b/ZuneImpl/Service/CommunityCommerce.oz.cs
index 836ccbb..1ff2825 100644
--- a/ZuneImpl/Service/CommunityCommerce.oz.cs
+++ b/ZuneImpl/Service/CommunityCommerce.oz.cs
@@ -1,6 +1,4 @@
-#if OPENZUNE
-
-using System.Net.Http;
+using System.Net.Http;
 using ZuneUI;
 
 namespace Microsoft.Zune.Service
@@ -46,5 +44,3 @@ namespace Microsoft.Zune.Service
         }
     }
 }
-
-#endif
diff --git a/ZuneImpl/Service/CommunityService.cs b/ZuneImpl/Service/CommunityService.cs
index 7e63e05..9e027c9 100644
--- a/ZuneImpl/Service/CommunityService.cs
+++ b/ZuneImpl/Service/CommunityService.cs
@@ -2,8 +2,6 @@
 using System;
 using System.Collections;
 using System.Globalization;
-using System.Linq;
-using System.Text;
 using ZuneUI;
 
 namespace Microsoft.Zune.Service
diff --git a/ZuneImpl/Service/Escargot.lg.cs b/ZuneImpl/Service/Escargot.lg.cs
index f9a5a41..252aa6e 100644
--- a/ZuneImpl/Service/Escargot.lg.cs
+++ b/ZuneImpl/Service/Escargot.lg.cs
@@ -1,6 +1,4 @@
-#if !OPENZUNE
-
-using System.Net;
+using System.Net;
 
 namespace Microsoft.Zune.Service
 {
@@ -26,5 +24,3 @@ namespace Microsoft.Zune.Service
         }
     }
 }
-
-#endif
diff --git a/ZuneImpl/Service/Escargot.oz.cs b/ZuneImpl/Service/Escargot.oz.cs
index 5e6e24f..626c346 100644
--- a/ZuneImpl/Service/Escargot.oz.cs
+++ b/ZuneImpl/Service/Escargot.oz.cs
@@ -1,6 +1,4 @@
-#if OPENZUNE
-
-using System.Linq;
+using System.Linq;
 using System.Net.Http;
 
 namespace Microsoft.Zune.Service
@@ -36,5 +34,3 @@ namespace Microsoft.Zune.Service
         }
     }
 }
-
-#endif
diff --git a/ZuneImpl/ZuneImpl.csproj b/ZuneImpl/ZuneImpl.csproj
index 8669ec3..79fbd58 100644
--- a/ZuneImpl/ZuneImpl.csproj
+++ b/ZuneImpl/ZuneImpl.csproj
@@ -29,6 +29,18 @@
         <PackageReference Include="Zune.Xml" Version="0.1.0" />
 
         <ProjectReference Include="..\libs\MicrosoftIris\UIX\UIX.csproj" />
+
+        <None Include="**\*.lg.cs" Exclude="bin\**\*.lg.cs;obj\**\*.lg.cs" />
+        <Compile Remove="**\*.lg.cs" />
+        <Compile Include="**\*.lg.cs"
+                 Exclude="bin\**\*.lg.cs;obj\**\*.lg.cs"
+                 Condition="!$(UseOpenZune)" />
+
+        <None Include="**\*.oz.cs" Exclude="bin\**\*.oz.cs;obj\**\*.oz.cs" />
+        <Compile Remove="**\*.oz.cs" />
+        <Compile Include="**\*.oz.cs"
+                 Exclude="bin\**\*.oz.cs;obj\**\*.oz.cs"
+                 Condition="$(UseOpenZune)" />
     </ItemGroup>
 
     <Choose>
diff --git a/ZuneShell/ZuneShell.csproj b/ZuneShell/ZuneShell.csproj
index 19a500c..c89d39d 100644
--- a/ZuneShell/ZuneShell.csproj
+++ b/ZuneShell/ZuneShell.csproj
@@ -40,6 +40,18 @@
         <Reference Include="ZuneDBApi">
             <HintPath>C:\Program Files\Zune\ZuneDBApi.dll</HintPath>
         </Reference>
+
+        <None Include="**\*.lg.cs" Exclude="bin\**\*.lg.cs;obj\**\*.lg.cs" />
+        <Compile Remove="**\*.lg.cs" />
+        <Compile Include="**\*.lg.cs"
+                 Exclude="bin\**\*.lg.cs;obj\**\*.lg.cs"
+                 Condition="!$(UseOpenZune)" />
+
+        <None Include="**\*.oz.cs" Exclude="bin\**\*.oz.cs;obj\**\*.oz.cs" />
+        <Compile Remove="**\*.oz.cs" />
+        <Compile Include="**\*.oz.cs"
+                 Exclude="bin\**\*.oz.cs;obj\**\*.oz.cs"
+                 Condition="$(UseOpenZune)" />
     </ItemGroup>
 
     <Choose>