diff --git a/gen/tollvm.cpp b/gen/tollvm.cpp
index 07108619..7fbb7e8e 100644
--- a/gen/tollvm.cpp
+++ b/gen/tollvm.cpp
@@ -226,7 +226,7 @@ static llvm::Function* LLVM_DeclareMemIntrinsic(const char* name, int bits, bool
     pvec.push_back(bits==32?int32ty:int64ty);
     pvec.push_back(int32ty);
     llvm::FunctionType* functype = llvm::FunctionType::get(voidty, pvec, false);
-    return new llvm::Function(functype, llvm::GlobalValue::ExternalLinkage, name, gIR->module);
+    return llvm::cast<llvm::Function>(gIR->module->getOrInsertFunction(name, functype));
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
diff --git a/llvmdc.kdevelop b/llvmdc.kdevelop
index 9faf4f20..a777c095 100644
--- a/llvmdc.kdevelop
+++ b/llvmdc.kdevelop
@@ -169,9 +169,7 @@
       <synchronize>true</synchronize>
       <orientation>Vertical</orientation>
     </splitheadersource>
-    <references>
-      <pcs>LLVM</pcs>
-    </references>
+    <references/>
   </kdevcppsupport>
   <kdevcustomproject>
     <run>
diff --git a/llvmdc.kdevelop.filelist b/llvmdc.kdevelop.filelist
index 44511ee5..002f5b54 100644
--- a/llvmdc.kdevelop.filelist
+++ b/llvmdc.kdevelop.filelist
@@ -4,8 +4,6 @@ demos
 demos/gl.d
 demos/glfuncs.d
 demos/gltypes.d
-demos/lib.d
-demos/libtest1.d
 demos/qd.d
 demos/qd1.d
 demos/ray.d
@@ -174,7 +172,6 @@ lphobos/llvm
 lphobos/llvm/intrinsic.d
 lphobos/llvm/va_list.d
 lphobos/llvmsupport.d
-lphobos/obj
 lphobos/object.d
 lphobos/phobos.d
 lphobos/std
@@ -196,7 +193,6 @@ lphobos/std/c/stdio.d
 lphobos/std/c/stdlib.d
 lphobos/std/c/string.d
 lphobos/std/c/time.d
-lphobos/std/compiler.d
 lphobos/std/conv.d
 lphobos/std/ctype.d
 lphobos/std/format.d
@@ -770,7 +766,6 @@ tangotests/q.d
 tangotests/r.d
 tangotests/s.d
 tangotests/t.d
-tangotests/u.d
 test
 test/a.d
 test/aa1.d
@@ -923,7 +918,6 @@ test/funcptr.d
 test/funcs.d
 test/funcs2.d
 test/g.d
-test/gc1.d
 test/globals1.d
 test/globals2.d
 test/goto1.d
diff --git a/tango/lib/compiler/llvmdc/adi.d b/tango/lib/compiler/llvmdc/adi.d
index 1af7473b..276dcd6a 100644
--- a/tango/lib/compiler/llvmdc/adi.d
+++ b/tango/lib/compiler/llvmdc/adi.d
@@ -473,7 +473,7 @@ unittest
 
 extern (C) int _adCmpChar(Array a1, Array a2)
 {
-  version (X86)
+  version (D_InlineAsm_X86)
   {
     asm
     {   naked                   ;