diff --git a/lib/ExecutionEngine/Makefile b/lib/ExecutionEngine/Makefile
index 8012468d8b0..4a5641106d0 100644
--- a/lib/ExecutionEngine/Makefile
+++ b/lib/ExecutionEngine/Makefile
@@ -1,7 +1,6 @@
 LEVEL = ../..
 TOOLNAME = lli
-USEDLIBS = bcreader bcwriter vmcore asmwriter analysis support \
-	   target transforms
+USEDLIBS = bcreader vmcore analysis support target transforms
 TOOLLINKOPTS = -ldl
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/analyze/Makefile b/tools/analyze/Makefile
index 2374af3453f..9a33f950a4f 100644
--- a/tools/analyze/Makefile
+++ b/tools/analyze/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../..
 TOOLNAME = analyze
-USEDLIBS = analysis asmparser bcreader asmwriter scalaropts vmcore analysis ipa datastructure transforms support
+USEDLIBS = analysis asmparser bcreader scalaropts vmcore analysis ipa datastructure transforms support
 
 include $(LEVEL)/Makefile.common
 
diff --git a/tools/as/Makefile b/tools/as/Makefile
index 0845f0f8658..2a2ee1a3880 100644
--- a/tools/as/Makefile
+++ b/tools/as/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../..
 
 TOOLNAME = as
-USEDLIBS = asmparser bcwriter asmwriter vmcore support
+USEDLIBS = asmparser bcwriter vmcore support
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/dis/Makefile b/tools/dis/Makefile
index 0614c6dca7d..b9a314b7e3d 100644
--- a/tools/dis/Makefile
+++ b/tools/dis/Makefile
@@ -1,7 +1,7 @@
 LEVEL = ../..
 
 TOOLNAME = dis
-USEDLIBS = bcreader asmwriter vmcore support
+USEDLIBS = bcreader vmcore support
 include $(LEVEL)/Makefile.common
 
 
diff --git a/tools/gccas/Makefile b/tools/gccas/Makefile
index 144f9cbe42a..34ccd9a1e36 100644
--- a/tools/gccas/Makefile
+++ b/tools/gccas/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../..
 
 TOOLNAME = gccas
-USEDLIBS = asmparser bcwriter transforms scalaropts target analysis transforms ipa vmcore asmwriter support 
+USEDLIBS = asmparser bcwriter transforms scalaropts target analysis transforms ipa vmcore support 
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/gccld/Makefile b/tools/gccld/Makefile
index 2c02ad9e7f5..5d99de30f09 100644
--- a/tools/gccld/Makefile
+++ b/tools/gccld/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../..
 
 TOOLNAME = gccld
-USEDLIBS = transforms bcreader bcwriter asmwriter analysis vmcore asmwriter support
+USEDLIBS = transforms bcreader bcwriter analysis vmcore support
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/link/Makefile b/tools/link/Makefile
index 037e3a8750b..33a69139139 100644
--- a/tools/link/Makefile
+++ b/tools/link/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../..
 
 TOOLNAME = link
-USEDLIBS = transforms bcreader bcwriter asmwriter vmcore asmwriter support
+USEDLIBS = transforms bcreader bcwriter vmcore support
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llc/Makefile b/tools/llc/Makefile
index 569bb6110f3..85b741ef810 100644
--- a/tools/llc/Makefile
+++ b/tools/llc/Makefile
@@ -2,7 +2,7 @@ LEVEL = ../..
 TOOLNAME = llc
 USEDLIBS = sparc regalloc sched select target \
            instrument livevar bcreader bcwriter analysis transforms analysis \
-	   scalaropts vmcore asmwriter support
+	   scalaropts vmcore support
 
 include $(LEVEL)/Makefile.common
 
diff --git a/tools/lli/Makefile b/tools/lli/Makefile
index 8012468d8b0..4a5641106d0 100644
--- a/tools/lli/Makefile
+++ b/tools/lli/Makefile
@@ -1,7 +1,6 @@
 LEVEL = ../..
 TOOLNAME = lli
-USEDLIBS = bcreader bcwriter vmcore asmwriter analysis support \
-	   target transforms
+USEDLIBS = bcreader vmcore analysis support target transforms
 TOOLLINKOPTS = -ldl
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-as/Makefile b/tools/llvm-as/Makefile
index 0845f0f8658..2a2ee1a3880 100644
--- a/tools/llvm-as/Makefile
+++ b/tools/llvm-as/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../..
 
 TOOLNAME = as
-USEDLIBS = asmparser bcwriter asmwriter vmcore support
+USEDLIBS = asmparser bcwriter vmcore support
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-dis/Makefile b/tools/llvm-dis/Makefile
index 0614c6dca7d..b9a314b7e3d 100644
--- a/tools/llvm-dis/Makefile
+++ b/tools/llvm-dis/Makefile
@@ -1,7 +1,7 @@
 LEVEL = ../..
 
 TOOLNAME = dis
-USEDLIBS = bcreader asmwriter vmcore support
+USEDLIBS = bcreader vmcore support
 include $(LEVEL)/Makefile.common
 
 
diff --git a/tools/llvm-link/Makefile b/tools/llvm-link/Makefile
index 037e3a8750b..33a69139139 100644
--- a/tools/llvm-link/Makefile
+++ b/tools/llvm-link/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../..
 
 TOOLNAME = link
-USEDLIBS = transforms bcreader bcwriter asmwriter vmcore asmwriter support
+USEDLIBS = transforms bcreader bcwriter vmcore support
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/opt/Makefile b/tools/opt/Makefile
index 8a7fec4bfcb..678812a669a 100644
--- a/tools/opt/Makefile
+++ b/tools/opt/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../..
 TOOLNAME = opt
-USEDLIBS = bcreader bcwriter asmwriter instrument profpaths scalaropts \
+USEDLIBS = bcreader bcwriter instrument profpaths scalaropts \
            ipo ipa datastructure target analysis transforms vmcore support
 
 include $(LEVEL)/Makefile.common