diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 4a7c525003c..96391ca8dfe 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -2242,7 +2242,7 @@ Use `eglot-managed-p' to determine if current buffer is managed.")
         (when (and eglot-autoshutdown
                    (null (eglot--managed-buffers server))
                    ;; Don't shutdown if up again soon.
-                   (not revert-buffer-in-progress-p))
+                   (not revert-buffer-in-progress))
           (eglot-shutdown server)))))))
 
 (defun eglot--managed-mode-off ()
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index e3b2d207156..53602491cad 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -687,6 +687,9 @@ Before doing that, check if there are any old backups and get rid of them."
            (vc-make-version-backup file)))))
 
 (declare-function vc-dir-resynch-file "vc-dir" (&optional fname))
+(declare-function vc-fileset-diff-outgoing "vc" (&optional remote-location fileset))
+(declare-function vc-fileset-diff-incoming "vc" (&optional remote-location fileset))
+(declare-function vc-working-tree-switch-project "vc" (dir))
 
 (defvar vc-dir-buffers nil "List of `vc-dir' buffers.")