diff --git a/src/plugins/clangcodemodel/clang_installation.pri b/src/plugins/clangcodemodel/clang_installation.pri
index c2df14d34ba..59663e31124 100644
--- a/src/plugins/clangcodemodel/clang_installation.pri
+++ b/src/plugins/clangcodemodel/clang_installation.pri
@@ -35,10 +35,19 @@ defineReplace(findLLVMConfig) {
 
 win32 {
     LLVM_INCLUDEPATH = $$LLVM_INSTALL_DIR/include
-    LLVM_LIBS = -L$$LLVM_INSTALL_DIR/bin \
+    exists ($${LLVM_INSTALL_DIR}/lib/clang.*) {
+        CLANG_LIB = clang
+    } else {
+        exists ($${LLVM_INSTALL_DIR}/lib/libclang.*) {
+            CLANG_LIB = libclang
+        } else {
+            error("Cannot find Clang shared library!")
+        }
+    }
+    LLVM_LIBS = \
+        -L$$LLVM_INSTALL_DIR/bin \
         -L$$LLVM_INSTALL_DIR/lib \
-        -lclang
-
+        -l$${CLANG_LIB}
     LLVM_LIBS += -ladvapi32 -lshell32
 }
 
diff --git a/src/plugins/clangcodemodel/test/completiontesthelper.h b/src/plugins/clangcodemodel/test/completiontesthelper.h
index 95418b2c957..54a7c82038a 100644
--- a/src/plugins/clangcodemodel/test/completiontesthelper.h
+++ b/src/plugins/clangcodemodel/test/completiontesthelper.h
@@ -32,11 +32,12 @@
 
 #ifdef WITH_TESTS
 
+#include "../clangcompleter.h"
+
 #include <QObject>
 #include <QTextDocument>
 #include <texteditor/basetexteditor.h>
 #include <cplusplus/CppDocument.h>
-#include <clangcompleter.h>
 
 namespace TextEditor { class IAssistProposal; }