diff --git a/tools/analyze/Makefile b/tools/analyze/Makefile
index 9a33f950a4f..1694f1bb8a3 100644
--- a/tools/analyze/Makefile
+++ b/tools/analyze/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../..
 TOOLNAME = analyze
-USEDLIBS = analysis asmparser bcreader scalaropts vmcore analysis ipa datastructure transforms support
+USEDLIBS = asmparser bcreader scalaropts transforms analysis ipa datastructure transformutils vmcore support
 
 include $(LEVEL)/Makefile.common
 
diff --git a/tools/gccas/gccas.cpp b/tools/gccas/gccas.cpp
index 8539180c288..59c12713fb5 100644
--- a/tools/gccas/gccas.cpp
+++ b/tools/gccas/gccas.cpp
@@ -14,12 +14,7 @@
 #include "llvm/Transforms/LevelChange.h"
 #include "llvm/Transforms/ConstantMerge.h"
 #include "llvm/Transforms/ChangeAllocations.h"
-#include "llvm/Transforms/Scalar/ConstantProp.h"
-#include "llvm/Transforms/Scalar/DCE.h"
-#include "llvm/Transforms/Scalar/GCSE.h"
-#include "llvm/Transforms/Scalar/IndVarSimplify.h"
-#include "llvm/Transforms/Scalar/InstructionCombining.h"
-#include "llvm/Transforms/Scalar/PromoteMemoryToRegister.h"
+#include "llvm/Transforms/Scalar.h"
 #include "llvm/Bytecode/WriteBytecodePass.h"
 #include "Support/CommandLine.h"
 #include "Support/Signals.h"
diff --git a/tools/gccld/gccld.cpp b/tools/gccld/gccld.cpp
index 530b413bd4d..65bf40ebaaa 100644
--- a/tools/gccld/gccld.cpp
+++ b/tools/gccld/gccld.cpp
@@ -21,7 +21,7 @@
 #include "llvm/Bytecode/WriteBytecodePass.h"
 #include "llvm/Transforms/CleanupGCCOutput.h"
 #include "llvm/Transforms/ConstantMerge.h"
-#include "llvm/Transforms/Scalar/SymbolStripping.h"
+#include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/IPO/GlobalDCE.h"
 #include "llvm/Transforms/IPO/Internalize.h"
 #include "Support/CommandLine.h"
diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp
index 7626e03c4e5..515c903fbe0 100644
--- a/tools/llc/llc.cpp
+++ b/tools/llc/llc.cpp
@@ -9,7 +9,7 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Transforms/Instrumentation/TraceValues.h"
 #include "llvm/Transforms/ChangeAllocations.h"
-#include "llvm/Transforms/Scalar/DecomposeMultiDimRefs.h"
+#include "llvm/Transforms/Scalar.h"
 #include "llvm/Assembly/PrintModulePass.h"
 #include "llvm/Bytecode/WriteBytecodePass.h"
 #include "llvm/Transforms/ConstantMerge.h"
diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp
index c61ecfa1a60..7ced025763b 100644
--- a/tools/opt/opt.cpp
+++ b/tools/opt/opt.cpp
@@ -17,18 +17,11 @@
 #include "llvm/Transforms/LevelChange.h"
 #include "llvm/Transforms/FunctionInlining.h"
 #include "llvm/Transforms/ChangeAllocations.h"
+#include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/IPO/SimpleStructMutation.h"
 #include "llvm/Transforms/IPO/Internalize.h"
 #include "llvm/Transforms/IPO/GlobalDCE.h"
 #include "llvm/Transforms/IPO/PoolAllocate.h"
-#include "llvm/Transforms/Scalar/ConstantProp.h"
-#include "llvm/Transforms/Scalar/DCE.h"
-#include "llvm/Transforms/Scalar/DecomposeMultiDimRefs.h"
-#include "llvm/Transforms/Scalar/GCSE.h"
-#include "llvm/Transforms/Scalar/IndVarSimplify.h"
-#include "llvm/Transforms/Scalar/InstructionCombining.h"
-#include "llvm/Transforms/Scalar/PromoteMemoryToRegister.h"
-#include "llvm/Transforms/Scalar/SymbolStripping.h"
 #include "llvm/Transforms/Utils/UnifyFunctionExitNodes.h"
 #include "llvm/Transforms/Instrumentation/TraceValues.h"
 #include "llvm/Transforms/Instrumentation/ProfilePaths.h"