diff --git a/include/llvm/System/MappedFile.h b/include/llvm/System/MappedFile.h
index d74bf5c2bea..af13cbb5afe 100644
--- a/include/llvm/System/MappedFile.h
+++ b/include/llvm/System/MappedFile.h
@@ -15,7 +15,6 @@
 #define LLVM_SYSTEM_MAPPEDFILE_H
 
 #include "llvm/System/Path.h"
-#include "llvm/System/IncludeFile.h"
 
 namespace llvm {
 namespace sys {
@@ -162,7 +161,7 @@ namespace sys {
   /// @{
   private:
     ///< Disallow assignment
-    MappedFile& operator = ( const MappedFile & that );
+    MappedFile& operator=(const MappedFile &that);
     ///< Disallow copying
     MappedFile(const MappedFile& that);
   /// @}
@@ -170,6 +169,4 @@ namespace sys {
 }
 }
 
-FORCE_DEFINING_FILE_TO_BE_LINKED(SystemMappedFile)
-
 #endif
diff --git a/lib/System/MappedFile.cpp b/lib/System/MappedFile.cpp
index fb719f66e20..d2bc40355ee 100644
--- a/lib/System/MappedFile.cpp
+++ b/lib/System/MappedFile.cpp
@@ -32,4 +32,3 @@ using namespace sys;
 #include "Win32/MappedFile.inc"
 #endif
 
-DEFINING_FILE_FOR(SystemMappedFile)