diff --git a/gen/tollvm.cpp b/gen/tollvm.cpp
index 73c180f4..1022763e 100644
--- a/gen/tollvm.cpp
+++ b/gen/tollvm.cpp
@@ -399,10 +399,10 @@ LLValue* DtoPointedType(LLValue* ptr, LLValue* val)
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
-const LLType* DtoSize_t()
+const LLIntegerType* DtoSize_t()
 {
     // the type of size_t does not change once set
-    static const LLType* t = NULL;
+    static const LLIntegerType* t = NULL;
     if (t == NULL)
         t = (global.params.is64bit) ? LLType::Int64Ty : LLType::Int32Ty;
     return t;
@@ -563,7 +563,7 @@ llvm::ConstantInt* DtoConstUbyte(unsigned char i)
     return llvm::ConstantInt::get(LLType::Int8Ty, i, false);
 }
 
-llvm::ConstantFP* DtoConstFP(Type* t, long double value)
+LLConstant* DtoConstFP(Type* t, long double value)
 {
     const LLType* llty = DtoType(t);
     assert(llty->isFloatingPoint());
diff --git a/gen/tollvm.h b/gen/tollvm.h
index 97435b61..2244e831 100644
--- a/gen/tollvm.h
+++ b/gen/tollvm.h
@@ -37,7 +37,7 @@ LLGlobalValue::LinkageTypes DtoExternalLinkage(Dsymbol* sym);
 LLValue* DtoPointedType(LLValue* ptr, LLValue* val);
 
 // some types
-const LLType* DtoSize_t();
+const LLIntegerType* DtoSize_t();
 const LLStructType* DtoInterfaceInfoType();
 const LLStructType* DtoMutexType();
 const LLStructType* DtoModuleReferenceType();
@@ -55,7 +55,7 @@ LLConstantInt* DtoConstSize_t(uint64_t);
 LLConstantInt* DtoConstUint(unsigned i);
 LLConstantInt* DtoConstInt(int i);
 LLConstantInt* DtoConstUbyte(unsigned char i);
-llvm::ConstantFP* DtoConstFP(Type* t, long double value);
+LLConstant* DtoConstFP(Type* t, long double value);
 
 LLConstant* DtoConstString(const char*);
 LLConstant* DtoConstStringPtr(const char* str, const char* section = 0);