diff --git a/lib/Analysis/LiveVar/BBLiveVar.cpp b/lib/Analysis/LiveVar/BBLiveVar.cpp
index 251b2a51391..210a24bd095 100644
--- a/lib/Analysis/LiveVar/BBLiveVar.cpp
+++ b/lib/Analysis/LiveVar/BBLiveVar.cpp
@@ -1,7 +1,7 @@
 #include "llvm/Analysis/LiveVar/BBLiveVar.h"
 #include "llvm/Analysis/LiveVar/MethodLiveVarInfo.h"
 #include "llvm/CodeGen/MachineInstr.h"
-#include "../../CodeGen/TargetMachine/Sparc/SparcInternals.h"  // TODO: FIXME!! Only for PHI defn
+#include "../../Target/Sparc/SparcInternals.h"  // TODO: FIXME!! Only for PHI defn
 
 
 /********************* Implementation **************************************/
diff --git a/lib/CodeGen/TargetMachine/Makefile b/lib/CodeGen/TargetMachine/Makefile
index 55ee598b2c6..eefef8907a9 100644
--- a/lib/CodeGen/TargetMachine/Makefile
+++ b/lib/CodeGen/TargetMachine/Makefile
@@ -1,7 +1,5 @@
 LEVEL = ../../..
 
-DIRS  = Sparc
-
 LIBRARYNAME = target
 
 include $(LEVEL)/Makefile.common
diff --git a/lib/Makefile b/lib/Makefile
index 21a46794d87..cf205e3596f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,5 +1,5 @@
 LEVEL = ..
-DIRS = VMCore Analysis Assembly Bytecode Optimizations Support CodeGen
+DIRS = VMCore Analysis Assembly Bytecode Optimizations Support CodeGen Target
 
 include $(LEVEL)/Makefile.common
 
diff --git a/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp b/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp
index 251b2a51391..210a24bd095 100644
--- a/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp
+++ b/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp
@@ -1,7 +1,7 @@
 #include "llvm/Analysis/LiveVar/BBLiveVar.h"
 #include "llvm/Analysis/LiveVar/MethodLiveVarInfo.h"
 #include "llvm/CodeGen/MachineInstr.h"
-#include "../../CodeGen/TargetMachine/Sparc/SparcInternals.h"  // TODO: FIXME!! Only for PHI defn
+#include "../../Target/Sparc/SparcInternals.h"  // TODO: FIXME!! Only for PHI defn
 
 
 /********************* Implementation **************************************/
diff --git a/lib/Target/SparcV9/Makefile b/lib/Target/SparcV9/Makefile
index 2daca1f7729..515d931f26d 100644
--- a/lib/Target/SparcV9/Makefile
+++ b/lib/Target/SparcV9/Makefile
@@ -1,7 +1,4 @@
-LEVEL = ../../../..
-
-DIRS  = 
-
+LEVEL = ../../..
 LIBRARYNAME = sparc
 
 ## List source files in link order