4 files changed, 5 insertions, 5 deletions
diff --git a/llvm/lib/Analysis/LiveVar/BBLiveVar.h b/llvm/lib/Analysis/LiveVar/BBLiveVar.h
index ca2c48e668d..ab11a93d7d7 100644
--- a/llvm/lib/Analysis/LiveVar/BBLiveVar.h
+++ b/llvm/lib/Analysis/LiveVar/BBLiveVar.h
@@ -8,7 +8,7 @@
 #ifndef LIVE_VAR_BB_H
 #define LIVE_VAR_BB_H
 
-#include "llvm/Analysis/LiveVar/ValueSet.h"
+#include "llvm/CodeGen/ValueSet.h"
 #include "Support/Annotation.h"
 #include <map>
 class BasicBlock;
diff --git a/llvm/lib/Analysis/LiveVar/ValueSet.cpp b/llvm/lib/Analysis/LiveVar/ValueSet.cpp
index 1914f033020..d50d1073f60 100644
--- a/llvm/lib/Analysis/LiveVar/ValueSet.cpp
+++ b/llvm/lib/Analysis/LiveVar/ValueSet.cpp
@@ -1,7 +1,7 @@
 
+// FIXME: Eliminate this file.
 
-
-#include "llvm/Analysis/LiveVar/ValueSet.h"
+#include "llvm/CodeGen/ValueSet.h"
 #include "llvm/Value.h"
 #include <iostream>
 
diff --git a/llvm/lib/CodeGen/RegAlloc/LiveRange.h b/llvm/lib/CodeGen/RegAlloc/LiveRange.h
index 71eba1513bd..3a88a27fa1f 100644
--- a/llvm/lib/CodeGen/RegAlloc/LiveRange.h
+++ b/llvm/lib/CodeGen/RegAlloc/LiveRange.h
@@ -11,7 +11,7 @@
 #ifndef LIVE_RANGE_H
 #define LIVE_RANGE_H
 
-#include "llvm/Analysis/LiveVar/ValueSet.h"
+#include "llvm/CodeGen/ValueSet.h"
 #include "llvm/Value.h"
 
 class RegClass;
diff --git a/llvm/lib/CodeGen/RegAlloc/LiveRangeInfo.h b/llvm/lib/CodeGen/RegAlloc/LiveRangeInfo.h
index 71fda1613f8..3d9a43a9e3f 100644
--- a/llvm/lib/CodeGen/RegAlloc/LiveRangeInfo.h
+++ b/llvm/lib/CodeGen/RegAlloc/LiveRangeInfo.h
@@ -20,7 +20,7 @@
 #define LIVE_RANGE_INFO_H
 
 #include "Support/HashExtras.h"
-#include "llvm/Analysis/LiveVar/ValueSet.h"
+#include "llvm/CodeGen/ValueSet.h"
 
 class LiveRange;
 class MachineInstr;