10 files changed, 2 insertions, 28 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index 64f2d5d577c..012d0980f77 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -97,7 +97,7 @@ cpp11_projects          = test/Common \
                           test/IceGrid/% \
                           test/IceBridge/simple
 
-cpp11_excludes          =  test/Ice/gc
+cpp11_excludes          = test/Ice/gc
 
 #
 # If building on a Linux multilib platform, we restrict what we build for
@@ -124,7 +124,6 @@ cpp11_ldflags           = $(cpp11_cppflags)
 cpp11_targetname        = $(if $(or $(filter-out $($1_target),program), $(if $(filter icebox,$1), $(filter $(bindir)%,$($4_targetdir)),)),++11)
 cpp11_targetdir         = $(if $(filter %/build,$5),cpp11)
 
-
 #
 # $(call make-cpp-src-project,$1=project)
 #
diff --git a/cpp/src/Glacier2/msbuild/glacier2router.vcxproj b/cpp/src/Glacier2/msbuild/glacier2router.vcxproj
index fe0f7dd31cd..03baefb49f0 100644
--- a/cpp/src/Glacier2/msbuild/glacier2router.vcxproj
+++ b/cpp/src/Glacier2/msbuild/glacier2router.vcxproj
@@ -102,7 +102,6 @@
   <ItemGroup>
     <ClCompile Include="..\Blobject.cpp" />
     <ClCompile Include="..\ClientBlobject.cpp" />
-    <ClCompile Include="..\FilterI.cpp" />
     <ClCompile Include="..\FilterManager.cpp" />
     <ClCompile Include="..\Glacier2Router.cpp" />
     <ClCompile Include="..\Instance.cpp" />
diff --git a/cpp/src/Glacier2/msbuild/glacier2router.vcxproj.filters b/cpp/src/Glacier2/msbuild/glacier2router.vcxproj.filters
index 98e8dbedfc3..fd5ee4d3795 100644
--- a/cpp/src/Glacier2/msbuild/glacier2router.vcxproj.filters
+++ b/cpp/src/Glacier2/msbuild/glacier2router.vcxproj.filters
@@ -66,9 +66,6 @@
     <ClCompile Include="..\ClientBlobject.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\FilterI.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\FilterManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj.filters b/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj.filters
index 281993f13e6..153cc72997f 100644
--- a/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj.filters
+++ b/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj.filters
@@ -55,9 +55,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Application.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\NullPermissionsVerifier.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -150,9 +147,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\include\Glacier2\Application.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\Glacier2\Config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj.filters b/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj.filters
index 64b1fe25f8e..ce3d9494cdf 100644
--- a/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj.filters
+++ b/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj.filters
@@ -55,9 +55,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Application.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\NullPermissionsVerifier.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -150,9 +147,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\include\Glacier2\Application.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\Glacier2\Config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
index cbee9c217a0..96850561ebd 100644
--- a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
+++ b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
@@ -1121,7 +1121,6 @@
     <ClCompile Include="..\..\..\IceUtil\UUID.cpp" />
     <ClCompile Include="..\..\Acceptor.cpp" />
     <ClCompile Include="..\..\ACM.cpp" />
-    <ClCompile Include="..\..\Application.cpp" />
     <ClCompile Include="..\..\ArgVector.cpp" />
     <ClCompile Include="..\..\AsyncResult.cpp" />
     <ClCompile Include="..\..\Base64.cpp" />
diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters
index bdaf969dabe..4694a8cba55 100644
--- a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters
+++ b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters
@@ -606,9 +606,6 @@
     <ClCompile Include="..\..\ACM.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Application.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\ArgVector.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj b/cpp/src/Ice/msbuild/ice/ice.vcxproj
index a204e11119a..368805715c3 100644
--- a/cpp/src/Ice/msbuild/ice/ice.vcxproj
+++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj
@@ -1129,7 +1129,6 @@
     <ClCompile Include="..\..\..\IceUtil\UUID.cpp" />
     <ClCompile Include="..\..\Acceptor.cpp" />
     <ClCompile Include="..\..\ACM.cpp" />
-    <ClCompile Include="..\..\Application.cpp" />
     <ClCompile Include="..\..\ArgVector.cpp" />
     <ClCompile Include="..\..\AsyncResult.cpp" />
     <ClCompile Include="..\..\Base64.cpp" />
diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters b/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters
index 1c47655b24a..aa2fd08eefc 100644
--- a/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters
+++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters
@@ -605,9 +605,6 @@
     <ClCompile Include="..\..\ACM.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Application.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\ArgVector.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/swift/Rakefile b/swift/Rakefile
index 909f5498bd6..cf1c77e935d 100644
--- a/swift/Rakefile
+++ b/swift/Rakefile
@@ -153,8 +153,7 @@ def create_platform_targets(project, platform, bindist)
         end
 
         excludes = {
-            "Ice" => ["Application.cpp",
-                      "AsyncResult.cpp",
+            "Ice" => ["AsyncResult.cpp",
                       "AsyncResult.cpp",
                       "ConvertUTF.cpp",
                       "DLLMain.cpp",