diff --git a/lib/System/Win32/MappedFile.cpp b/lib/System/Win32/MappedFile.cpp
index 3112a93a8d3..237e1962fbb 100644
--- a/lib/System/Win32/MappedFile.cpp
+++ b/lib/System/Win32/MappedFile.cpp
@@ -16,7 +16,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "Win32.h"
-#include "llvm/System/MappedFile.h"
 #include "llvm/System/Process.h"
 
 namespace llvm {
diff --git a/lib/System/Win32/MappedFile.inc b/lib/System/Win32/MappedFile.inc
index 3112a93a8d3..237e1962fbb 100644
--- a/lib/System/Win32/MappedFile.inc
+++ b/lib/System/Win32/MappedFile.inc
@@ -16,7 +16,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "Win32.h"
-#include "llvm/System/MappedFile.h"
 #include "llvm/System/Process.h"
 
 namespace llvm {
diff --git a/lib/System/Win32/Memory.cpp b/lib/System/Win32/Memory.cpp
index ab3bb517723..f7b05abe037 100644
--- a/lib/System/Win32/Memory.cpp
+++ b/lib/System/Win32/Memory.cpp
@@ -13,7 +13,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "Win32.h"
-#include "llvm/System/Memory.h"
 #include "llvm/System/Process.h"
 
 namespace llvm {
diff --git a/lib/System/Win32/Memory.inc b/lib/System/Win32/Memory.inc
index ab3bb517723..f7b05abe037 100644
--- a/lib/System/Win32/Memory.inc
+++ b/lib/System/Win32/Memory.inc
@@ -13,7 +13,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "Win32.h"
-#include "llvm/System/Memory.h"
 #include "llvm/System/Process.h"
 
 namespace llvm {
diff --git a/lib/System/Win32/Path.cpp b/lib/System/Win32/Path.cpp
index 08a3d402e88..944aea101fb 100644
--- a/lib/System/Win32/Path.cpp
+++ b/lib/System/Win32/Path.cpp
@@ -20,7 +20,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "Win32.h"
-#include <llvm/System/Path.h>
 #include <fstream>
 #include <malloc.h>
 
diff --git a/lib/System/Win32/Path.inc b/lib/System/Win32/Path.inc
index 08a3d402e88..944aea101fb 100644
--- a/lib/System/Win32/Path.inc
+++ b/lib/System/Win32/Path.inc
@@ -20,7 +20,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "Win32.h"
-#include <llvm/System/Path.h>
 #include <fstream>
 #include <malloc.h>
 
diff --git a/lib/System/Win32/Process.cpp b/lib/System/Win32/Process.cpp
index 61572582107..5a4b4f0dbbb 100644
--- a/lib/System/Win32/Process.cpp
+++ b/lib/System/Win32/Process.cpp
@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "Win32.h"
-#include "llvm/System/Process.h"
 
 //===----------------------------------------------------------------------===//
 //=== WARNING: Implementation here must contain only Win32 specific code 
diff --git a/lib/System/Win32/Process.inc b/lib/System/Win32/Process.inc
index 61572582107..5a4b4f0dbbb 100644
--- a/lib/System/Win32/Process.inc
+++ b/lib/System/Win32/Process.inc
@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "Win32.h"
-#include "llvm/System/Process.h"
 
 //===----------------------------------------------------------------------===//
 //=== WARNING: Implementation here must contain only Win32 specific code 
diff --git a/lib/System/Win32/Program.cpp b/lib/System/Win32/Program.cpp
index 0078fb76628..a509788ce35 100644
--- a/lib/System/Win32/Program.cpp
+++ b/lib/System/Win32/Program.cpp
@@ -13,7 +13,6 @@
 
 // Include the generic Unix implementation
 #include "Win32.h"
-#include "llvm/System/Program.h"
 #include <malloc.h>
 
 //===----------------------------------------------------------------------===//
diff --git a/lib/System/Win32/Program.inc b/lib/System/Win32/Program.inc
index 0078fb76628..a509788ce35 100644
--- a/lib/System/Win32/Program.inc
+++ b/lib/System/Win32/Program.inc
@@ -13,7 +13,6 @@
 
 // Include the generic Unix implementation
 #include "Win32.h"
-#include "llvm/System/Program.h"
 #include <malloc.h>
 
 //===----------------------------------------------------------------------===//
diff --git a/lib/System/Win32/SysConfig.cpp b/lib/System/Win32/SysConfig.cpp
index b3a941bad9d..66a463ba934 100644
--- a/lib/System/Win32/SysConfig.cpp
+++ b/lib/System/Win32/SysConfig.cpp
@@ -11,8 +11,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/System/SysConfig.h"
-
 namespace llvm {
 
 // Some LLVM programs such as bugpoint produce core files as a normal part of