diff --git a/src/messages/textDocument_completion.cc b/src/messages/textDocument_completion.cc
index cf60847a..1c6b662a 100644
--- a/src/messages/textDocument_completion.cc
+++ b/src/messages/textDocument_completion.cc
@@ -406,7 +406,12 @@ public:
   std::vector<CompletionItem> ls_items;
 
   CompletionConsumer(const CodeCompleteOptions &Opts, bool from_cache)
-      : CodeCompleteConsumer(Opts, false),
+      :
+#if LLVM_VERSION_MAJOR >= 9 // rC358696
+        CodeCompleteConsumer(Opts),
+#else
+        CodeCompleteConsumer(Opts, false),
+#endif
         Alloc(std::make_shared<clang::GlobalCodeCompletionAllocator>()),
         CCTUInfo(Alloc), from_cache(from_cache) {}
 
diff --git a/src/messages/textDocument_signatureHelp.cc b/src/messages/textDocument_signatureHelp.cc
index 68af2dcc..b6889190 100644
--- a/src/messages/textDocument_signatureHelp.cc
+++ b/src/messages/textDocument_signatureHelp.cc
@@ -75,9 +75,14 @@ class SignatureHelpConsumer : public CodeCompleteConsumer {
 public:
   bool from_cache;
   SignatureHelp ls_sighelp;
-  SignatureHelpConsumer(const clang::CodeCompleteOptions &CCOpts,
+  SignatureHelpConsumer(const clang::CodeCompleteOptions &Opts,
                         bool from_cache)
-      : CodeCompleteConsumer(CCOpts, false),
+      :
+#if LLVM_VERSION_MAJOR >= 9 // rC358696
+        CodeCompleteConsumer(Opts),
+#else
+        CodeCompleteConsumer(Opts, false),
+#endif
         Alloc(std::make_shared<GlobalCodeCompletionAllocator>()),
         CCTUInfo(Alloc), from_cache(from_cache) {}
   void ProcessOverloadCandidates(Sema &S, unsigned CurrentArg,