2 files changed, 6 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b27fbea0d14..1bb24cb549f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -31,6 +31,9 @@
 
         * term/w32-win.el (create-default-fontset): Declare.
 
+        * w32-common-fns.el (x-server-version, x-select-enable-clipboard):
+        Declare.
+
         * window.el (x-display-pixel-height, tool-bar-lines-needed): Declare.
         (fit-frame-to-buffer): Explicit error if --without-x.
         (mouse-autoselect-window-select): Silence compiler.
diff --git a/lisp/w32-common-fns.el b/lisp/w32-common-fns.el
index 5d8d7171860..6b1c3ac976e 100644
--- a/lisp/w32-common-fns.el
+++ b/lisp/w32-common-fns.el
@@ -23,6 +23,8 @@
 ;;; and Cygwin Emacs compiled to use the native Windows widget
 ;;; library.
 
+(declare-function x-server-version "w32fns.c" (&optional terminal))
+
 (defun w32-version ()
   "Return the MS-Windows version numbers.
 The value is a list of three integers: the major and minor version
@@ -100,6 +102,7 @@ in `selection-converter-alist', which see."
 ;; current selection against it, and avoid passing back our own text
 ;; from x-selection-value.
 (defvar x-last-selected-text nil)
+(defvar x-select-enable-clipboard)
 
 (defun x-get-selection-value ()
   "Return the value of the current selection.