diff --git a/lib/Target/Sparc/Makefile b/lib/Target/Sparc/Makefile
index f2f8c5f8ce6..5199b67f3a5 100644
--- a/lib/Target/Sparc/Makefile
+++ b/lib/Target/Sparc/Makefile
@@ -1,4 +1,4 @@
-##===- lib/Target/Sparc/V8/Makefile ------------------------*- Makefile -*-===##
+##===- lib/Target/SparcV8/Makefile -------------------------*- Makefile -*-===##
 # 
 #                     The LLVM Compiler Infrastructure
 #
@@ -6,7 +6,7 @@
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
+LEVEL = ../../..
 LIBRARYNAME = LLVMSparcV8
 TARGET = SparcV8
 
diff --git a/lib/Target/Sparc/Sparc.td b/lib/Target/Sparc/Sparc.td
index 892b9cc350a..dabb0dc9760 100644
--- a/lib/Target/Sparc/Sparc.td
+++ b/lib/Target/Sparc/Sparc.td
@@ -14,7 +14,7 @@
 // Target-independent interfaces which we are implementing
 //===----------------------------------------------------------------------===//
 
-include "../../Target.td"
+include "../Target.td"
 
 //===----------------------------------------------------------------------===//
 // Register File Description
diff --git a/lib/Target/SparcV8/Makefile b/lib/Target/SparcV8/Makefile
index f2f8c5f8ce6..5199b67f3a5 100644
--- a/lib/Target/SparcV8/Makefile
+++ b/lib/Target/SparcV8/Makefile
@@ -1,4 +1,4 @@
-##===- lib/Target/Sparc/V8/Makefile ------------------------*- Makefile -*-===##
+##===- lib/Target/SparcV8/Makefile -------------------------*- Makefile -*-===##
 # 
 #                     The LLVM Compiler Infrastructure
 #
@@ -6,7 +6,7 @@
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
+LEVEL = ../../..
 LIBRARYNAME = LLVMSparcV8
 TARGET = SparcV8
 
diff --git a/lib/Target/SparcV8/SparcV8.td b/lib/Target/SparcV8/SparcV8.td
index 892b9cc350a..dabb0dc9760 100644
--- a/lib/Target/SparcV8/SparcV8.td
+++ b/lib/Target/SparcV8/SparcV8.td
@@ -14,7 +14,7 @@
 // Target-independent interfaces which we are implementing
 //===----------------------------------------------------------------------===//
 
-include "../../Target.td"
+include "../Target.td"
 
 //===----------------------------------------------------------------------===//
 // Register File Description