diff --git a/lib/Transforms/Instrumentation/EmitFunctions.cpp b/lib/Transforms/Instrumentation/EmitFunctions.cpp
index 0025d3e2b60..c74f93c94b8 100644
--- a/lib/Transforms/Instrumentation/EmitFunctions.cpp
+++ b/lib/Transforms/Instrumentation/EmitFunctions.cpp
@@ -82,7 +82,7 @@ bool EmitFunctionTable::run(Module &M){
     }
   
   StructType *sttype = StructType::get(vType);
-  ConstantStruct *cstruct = ConstantStruct::get(sttype, vConsts);
+  Constant *cstruct = ConstantStruct::get(sttype, vConsts);
 
   GlobalVariable *gb = new GlobalVariable(cstruct->getType(), true,
                                           GlobalValue::ExternalLinkage, 
diff --git a/lib/VMCore/Constants.cpp b/lib/VMCore/Constants.cpp
index 280e00520e5..06f23c165ec 100644
--- a/lib/VMCore/Constants.cpp
+++ b/lib/VMCore/Constants.cpp
@@ -459,7 +459,7 @@ void ConstantStruct::replaceUsesOfWithOnConstant(Value *From, Value *To,
     Values.push_back(Val);
   }
   
-  ConstantStruct *Replacement = ConstantStruct::get(getType(), Values);
+  Constant *Replacement = ConstantStruct::get(getType(), Values);
   assert(Replacement != this && "I didn't contain From!");
 
   // Everyone using this now uses the replacement...