diff --git a/llvm/lib/Transforms/Scalar/ABCD.cpp b/llvm/lib/Transforms/Scalar/ABCD.cpp
diff --git a/llvm/lib/Transforms/Scalar/CMakeLists.txt b/llvm/lib/Transforms/Scalar/CMakeLists.txt
@@ -1,5 +1,4 @@
 add_llvm_library(LLVMScalarOpts
-  
-  ABCD.cpp
  ADCE.cpp
  BasicBlockPlacement.cpp
  CodeGenPrepare.cpp

diff --git a/llvm/lib/Transforms/Utils/CMakeLists.txt b/llvm/lib/Transforms/Utils/CMakeLists.txt
@@ -20,7 +20,6 @@ add_llvm_library(LLVMTransformUtils
  Mem2Reg.cpp
  PromoteMemoryToRegister.cpp
  SSAUpdater.cpp
-  
-  SSI.cpp
  SimplifyCFG.cpp
  UnifyFunctionExitNodes.cpp
  ValueMapper.cpp

diff --git a/llvm/lib/Transforms/Utils/SSI.cpp b/llvm/lib/Transforms/Utils/SSI.cpp
diff --git a/llvm/test/Transforms/ABCD/basic.ll b/llvm/test/Transforms/ABCD/basic.ll
diff --git a/llvm/test/Transforms/ABCD/dg.exp b/llvm/test/Transforms/ABCD/dg.exp
diff --git a/llvm/test/Transforms/SSI/2009-07-09-Invoke.ll b/llvm/test/Transforms/SSI/2009-07-09-Invoke.ll
diff --git a/llvm/test/Transforms/SSI/2009-08-15-UnreachableBB.ll b/llvm/test/Transforms/SSI/2009-08-15-UnreachableBB.ll
diff --git a/llvm/test/Transforms/SSI/2009-08-17-CritEdge.ll b/llvm/test/Transforms/SSI/2009-08-17-CritEdge.ll
diff --git a/llvm/test/Transforms/SSI/2009-08-19-UnreachableBB2.ll b/llvm/test/Transforms/SSI/2009-08-19-UnreachableBB2.ll
diff --git a/llvm/test/Transforms/SSI/dg.exp b/llvm/test/Transforms/SSI/dg.exp
diff --git a/llvm/test/Transforms/SSI/ssiphi.ll b/llvm/test/Transforms/SSI/ssiphi.ll