diff --git a/lib/Support/Mangler.cpp b/lib/Support/Mangler.cpp
index 5bae6f04f67..665cb7388c1 100644
--- a/lib/Support/Mangler.cpp
+++ b/lib/Support/Mangler.cpp
@@ -4,14 +4,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <iostream>
-#include <set>
-#include <string>
-#include "llvm/Value.h"
+#include "llvm/Support/Mangler.h"
 #include "llvm/Module.h"
 #include "llvm/Type.h"
 #include "Support/StringExtras.h"
-#include "llvm/Support/Mangler.h"
 
 /// makeNameProper - We don't want identifier names with ., space, or
 /// - in them, so we mangle these characters into the strings "d_",
diff --git a/lib/VMCore/Mangler.cpp b/lib/VMCore/Mangler.cpp
index 5bae6f04f67..665cb7388c1 100644
--- a/lib/VMCore/Mangler.cpp
+++ b/lib/VMCore/Mangler.cpp
@@ -4,14 +4,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <iostream>
-#include <set>
-#include <string>
-#include "llvm/Value.h"
+#include "llvm/Support/Mangler.h"
 #include "llvm/Module.h"
 #include "llvm/Type.h"
 #include "Support/StringExtras.h"
-#include "llvm/Support/Mangler.h"
 
 /// makeNameProper - We don't want identifier names with ., space, or
 /// - in them, so we mangle these characters into the strings "d_",
diff --git a/support/lib/Support/Mangler.cpp b/support/lib/Support/Mangler.cpp
index 5bae6f04f67..665cb7388c1 100644
--- a/support/lib/Support/Mangler.cpp
+++ b/support/lib/Support/Mangler.cpp
@@ -4,14 +4,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <iostream>
-#include <set>
-#include <string>
-#include "llvm/Value.h"
+#include "llvm/Support/Mangler.h"
 #include "llvm/Module.h"
 #include "llvm/Type.h"
 #include "Support/StringExtras.h"
-#include "llvm/Support/Mangler.h"
 
 /// makeNameProper - We don't want identifier names with ., space, or
 /// - in them, so we mangle these characters into the strings "d_",