diff --git a/eden/fs/service/CMakeLists.txt b/eden/fs/service/CMakeLists.txt
index f2c298bb0f..60e1d2eb60 100644
--- a/eden/fs/service/CMakeLists.txt
+++ b/eden/fs/service/CMakeLists.txt
@@ -19,7 +19,7 @@ file(GLOB SERVICE_SRCS "*.cpp")
 add_library(
   eden_service STATIC
     ${SERVICE_SRCS}
-    oss/RunServer.cpp
+    oss/main.cpp
 )
 target_link_libraries(
   eden_service
diff --git a/eden/fs/service/main.cpp b/eden/fs/service/EdenMain.cpp
similarity index 99%
rename from eden/fs/service/main.cpp
rename to eden/fs/service/EdenMain.cpp
index f7d35f9bb7..f23a230ae0 100644
--- a/eden/fs/service/main.cpp
+++ b/eden/fs/service/EdenMain.cpp
@@ -7,7 +7,7 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  *
  */
-#include "eden/fs/service/main.h"
+#include "eden/fs/service/EdenMain.h"
 
 #include <boost/filesystem.hpp>
 #include <folly/Conv.h>
diff --git a/eden/fs/service/main.h b/eden/fs/service/EdenMain.h
similarity index 100%
rename from eden/fs/service/main.h
rename to eden/fs/service/EdenMain.h
diff --git a/eden/fs/service/oss/RunServer.cpp b/eden/fs/service/oss/main.cpp
similarity index 91%
rename from eden/fs/service/oss/RunServer.cpp
rename to eden/fs/service/oss/main.cpp
index cb2a010492..b6105f1b9a 100644
--- a/eden/fs/service/oss/RunServer.cpp
+++ b/eden/fs/service/oss/main.cpp
@@ -7,7 +7,7 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  *
  */
-#include "eden/fs/service/main.h"
+#include "eden/fs/service/EdenMain.h"
 
 int main(int argc, char** argv) {
   facebook::eden::EdenMain server;
diff --git a/eden/win/fs/edenfs.vcxproj b/eden/win/fs/edenfs.vcxproj
index 9a6972160a..1fff371a0d 100644
--- a/eden/win/fs/edenfs.vcxproj
+++ b/eden/win/fs/edenfs.vcxproj
@@ -263,7 +263,6 @@
     <ClInclude Include="..\..\fs\service\EdenError.h" />
     <ClInclude Include="..\..\fs\service\EdenServer.h" />
     <ClInclude Include="..\..\fs\service\EdenServiceHandler.h" />
-    <ClInclude Include="..\..\fs\service\main.h" />
     <ClInclude Include="..\..\fs\service\StreamingSubscriber.h" />
     <ClInclude Include="..\..\fs\sqlite\Sqlite.h" />
     <ClInclude Include="..\..\fs\store\BackingStore.h" />
diff --git a/eden/win/fs/edenfs.vcxproj.filters b/eden/win/fs/edenfs.vcxproj.filters
index b03e1d34ad..eff87897f4 100644
--- a/eden/win/fs/edenfs.vcxproj.filters
+++ b/eden/win/fs/edenfs.vcxproj.filters
@@ -406,9 +406,6 @@
     <ClInclude Include="..\..\fs\service\EdenServer.h">
       <Filter>fs\Service</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\fs\service\main.h">
-      <Filter>fs\Service</Filter>
-    </ClInclude>
     <ClInclude Include="Stub.h">
       <Filter>Win\Stubs</Filter>
     </ClInclude>