diff --git a/include/llvm/LinkAllVMCore.h b/include/llvm/LinkAllVMCore.h
index fa46dbb..ae1e1cd 100644
--- a/include/llvm/LinkAllVMCore.h
+++ b/include/llvm/LinkAllVMCore.h
@@ -23,8 +23,16 @@
 #include "llvm/IntrinsicInst.h"
 #include "llvm/InlineAsm.h"
 #include "llvm/Analysis/Verifier.h"
+#include "llvm/System/Alarm.h"
+#include "llvm/System/DynamicLibrary.h"
+#include "llvm/System/MappedFile.h"
 #include "llvm/System/Memory.h"
 #include "llvm/System/Mutex.h"
+#include "llvm/System/Path.h"
+#include "llvm/System/Process.h"
+#include "llvm/System/Program.h"
+#include "llvm/System/Signals.h"
+#include "llvm/System/TimeValue.h"
 #include "llvm/Support/Dwarf.h"
 #include "llvm/Support/Mangler.h"
 #include "llvm/Support/MathExtras.h"
diff --git a/include/llvm/System/Alarm.h b/include/llvm/System/Alarm.h
index ec44a6d..2b78da6 100644
--- a/include/llvm/System/Alarm.h
+++ b/include/llvm/System/Alarm.h
@@ -17,6 +17,8 @@
 #ifndef LLVM_SYSTEM_ALARM_H
 #define LLVM_SYSTEM_ALARM_H
 
+#include "llvm/System/IncludeFile.h"
+
 namespace llvm {
 namespace sys {
 
@@ -42,4 +44,6 @@
 } // End sys namespace
 } // End llvm namespace
 
+FORCE_DEFINING_FILE_TO_BE_LINKED(SystemAlarm)
+
 #endif
diff --git a/include/llvm/System/DynamicLibrary.h b/include/llvm/System/DynamicLibrary.h
index e053daf..fc1bfbe 100644
--- a/include/llvm/System/DynamicLibrary.h
+++ b/include/llvm/System/DynamicLibrary.h
@@ -15,6 +15,7 @@
 #define LLVM_SYSTEM_DYNAMIC_LIBRARY_H
 
 #include "llvm/System/Path.h"
+#include "llvm/System/IncludeFile.h"
 #include <string>
 
 namespace llvm {
@@ -125,4 +126,6 @@
 } // End sys namespace
 } // End llvm namespace
 
+FORCE_DEFINING_FILE_TO_BE_LINKED(SystemDynamicLibrary)
+
 #endif // LLVM_SYSTEM_DYNAMIC_LIBRARY_H
diff --git a/include/llvm/System/MappedFile.h b/include/llvm/System/MappedFile.h
index 9fd0d08..3160427 100644
--- a/include/llvm/System/MappedFile.h
+++ b/include/llvm/System/MappedFile.h
@@ -15,6 +15,7 @@
 #define LLVM_SYSTEM_MAPPEDFILE_H
 
 #include "llvm/System/Path.h"
+#include "llvm/System/IncludeFile.h"
 
 namespace llvm {
 namespace sys {
@@ -152,5 +153,6 @@
 }
 }
 
+FORCE_DEFINING_FILE_TO_BE_LINKED(SystemMappedFile)
 
 #endif
diff --git a/include/llvm/System/Path.h b/include/llvm/System/Path.h
index 14250b5..b4eaca7 100644
--- a/include/llvm/System/Path.h
+++ b/include/llvm/System/Path.h
@@ -15,6 +15,7 @@
 #define LLVM_SYSTEM_PATH_H
 
 #include "llvm/System/TimeValue.h"
+#include "llvm/System/IncludeFile.h"
 #include <set>
 #include <string>
 #include <vector>
@@ -571,4 +572,5 @@
 
 }
 
+FORCE_DEFINING_FILE_TO_BE_LINKED(SystemPath)
 #endif
diff --git a/include/llvm/System/Process.h b/include/llvm/System/Process.h
index 600d8d5..f843af3 100644
--- a/include/llvm/System/Process.h
+++ b/include/llvm/System/Process.h
@@ -15,6 +15,7 @@
 #define LLVM_SYSTEM_PROCESS_H
 
 #include "llvm/System/TimeValue.h"
+#include "llvm/System/IncludeFile.h"
 
 namespace llvm {
 namespace sys {
@@ -99,5 +100,6 @@
 }
 }
 
+FORCE_DEFINING_FILE_TO_BE_LINKED(SystemProcess)
 
 #endif
diff --git a/include/llvm/System/Program.h b/include/llvm/System/Program.h
index 0a237bc..92534de 100644
--- a/include/llvm/System/Program.h
+++ b/include/llvm/System/Program.h
@@ -15,6 +15,7 @@
 #define LLVM_SYSTEM_PROGRAM_H
 
 #include "llvm/System/Path.h"
+#include "llvm/System/IncludeFile.h"
 #include <vector>
 
 namespace llvm {
@@ -82,5 +83,6 @@
 }
 }
 
+FORCE_DEFINING_FILE_TO_BE_LINKED(SystemProgram)
 
 #endif
diff --git a/include/llvm/System/Signals.h b/include/llvm/System/Signals.h
index 1d5286f..21feb5b 100644
--- a/include/llvm/System/Signals.h
+++ b/include/llvm/System/Signals.h
@@ -16,6 +16,7 @@
 #define LLVM_SYSTEM_SIGNALS_H
 
 #include "llvm/System/Path.h"
+#include "llvm/System/IncludeFile.h"
 
 namespace llvm {
 namespace sys {
@@ -49,4 +50,6 @@
 } // End sys namespace
 } // End llvm namespace
 
+FORCE_DEFINING_FILE_TO_BE_LINKED(SystemSignals)
+
 #endif
diff --git a/include/llvm/System/TimeValue.h b/include/llvm/System/TimeValue.h
index 624eb70..07cb18c 100644
--- a/include/llvm/System/TimeValue.h
+++ b/include/llvm/System/TimeValue.h
@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Support/DataTypes.h"
+#include "llvm/System/IncludeFile.h"
 #include <string>
 
 #ifndef LLVM_SYSTEM_TIMEVALUE_H
@@ -380,4 +381,6 @@
 }
 }
 
+FORCE_DEFINING_FILE_TO_BE_LINKED(SystemTimeValue)
+
 #endif
diff --git a/lib/System/Alarm.cpp b/lib/System/Alarm.cpp
index d782b29..e0b7f72 100644
--- a/lib/System/Alarm.cpp
+++ b/lib/System/Alarm.cpp
@@ -32,3 +32,4 @@
 #include "Win32/Alarm.inc"
 #endif
 
+DEFINING_FILE_FOR(SystemAlarm)
diff --git a/lib/System/DynamicLibrary.cpp b/lib/System/DynamicLibrary.cpp
index 435513d..859092a 100644
--- a/lib/System/DynamicLibrary.cpp
+++ b/lib/System/DynamicLibrary.cpp
@@ -173,3 +173,5 @@
 }
 
 #endif // LLVM_ON_WIN32
+
+DEFINING_FILE_FOR(SystemDynamicLibrary)
diff --git a/lib/System/MappedFile.cpp b/lib/System/MappedFile.cpp
index a91a623..41b5946 100644
--- a/lib/System/MappedFile.cpp
+++ b/lib/System/MappedFile.cpp
@@ -32,3 +32,4 @@
 #include "Win32/MappedFile.inc"
 #endif
 
+DEFINING_FILE_FOR(SystemMappedFile)
diff --git a/lib/System/Path.cpp b/lib/System/Path.cpp
index efadfa9..1246038 100644
--- a/lib/System/Path.cpp
+++ b/lib/System/Path.cpp
@@ -107,3 +107,5 @@
 #if defined(LLVM_ON_WIN32)
 #include "Win32/Path.inc"
 #endif
+
+DEFINING_FILE_FOR(SystemPath)
diff --git a/lib/System/Process.cpp b/lib/System/Process.cpp
index 644a81e..d69f78e 100644
--- a/lib/System/Process.cpp
+++ b/lib/System/Process.cpp
@@ -32,3 +32,4 @@
 #include "Win32/Process.inc"
 #endif
 
+DEFINING_FILE_FOR(SystemProcess)
diff --git a/lib/System/Program.cpp b/lib/System/Program.cpp
index 22c38e2..e91a3d5 100644
--- a/lib/System/Program.cpp
+++ b/lib/System/Program.cpp
@@ -32,3 +32,4 @@
 #include "Win32/Program.inc"
 #endif
 
+DEFINING_FILE_FOR(SystemProgram)
diff --git a/lib/System/Signals.cpp b/lib/System/Signals.cpp
index 2d0de9b..229dd14 100644
--- a/lib/System/Signals.cpp
+++ b/lib/System/Signals.cpp
@@ -33,3 +33,4 @@
 #include "Win32/Signals.inc"
 #endif
 
+DEFINING_FILE_FOR(SystemSignals)
diff --git a/lib/System/TimeValue.cpp b/lib/System/TimeValue.cpp
index 227d677..8ecfd22 100644
--- a/lib/System/TimeValue.cpp
+++ b/lib/System/TimeValue.cpp
@@ -56,3 +56,4 @@
 #include "Win32/TimeValue.inc"
 #endif
 
+DEFINING_FILE_FOR(SystemTimeValue)