diff --git a/Cask b/Cask
index 39c78b7b..e4b5d47b 100644
--- a/Cask
+++ b/Cask
@@ -1,4 +1,4 @@
-(package "evil" "1.2.15" "Extensible Vi layer for Emacs.")
+(package "evil" "1.2.16" "Extensible Vi layer for Emacs.")
 
 (files "*.el")
 
diff --git a/evil-command-window.el b/evil-command-window.el
index 9284a60d..a25739f6 100644
--- a/evil-command-window.el
+++ b/evil-command-window.el
@@ -2,7 +2,7 @@
 ;; Author: Emanuel Evans <emanuel.evans at gmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.2.15
+;; Version: 1.2.16
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-commands.el b/evil-commands.el
index 84d7c302..1cc63cb7 100644
--- a/evil-commands.el
+++ b/evil-commands.el
@@ -2,7 +2,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.2.15
+;; Version: 1.2.16
 
 ;;
 ;; This file is NOT part of GNU Emacs.
@@ -2735,6 +2735,8 @@ The search is unbounded, i.e., the pattern is not wrapped in
   (and (fboundp 'semantic-ia-fast-jump)
        (ignore-errors (semantic-ia-fast-jump position))))
 
+(declare-function xref-backend-identifier-at-point "xref")
+
 (defun evil-goto-definition-xref (_string position)
   "Find definition at POSITION with xref."
   (when (fboundp 'xref-find-definitions)
diff --git a/evil-common.el b/evil-common.el
index f903785b..80469379 100644
--- a/evil-common.el
+++ b/evil-common.el
@@ -2,7 +2,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.2.15
+;; Version: 1.2.16
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-core.el b/evil-core.el
index d08e37ed..39ea9554 100644
--- a/evil-core.el
+++ b/evil-core.el
@@ -2,7 +2,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.2.15
+;; Version: 1.2.16
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-development.el b/evil-development.el
index 25413869..0530c4b2 100644
--- a/evil-development.el
+++ b/evil-development.el
@@ -2,7 +2,7 @@
 
 ;; Author: Justin Burkett <justin at burkett dot cc>
 
-;; Version: 1.2.15
+;; Version: 1.2.16
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-digraphs.el b/evil-digraphs.el
index 16170d50..902b6b9b 100644
--- a/evil-digraphs.el
+++ b/evil-digraphs.el
@@ -3,7 +3,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.2.15
+;; Version: 1.2.16
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-ex.el b/evil-ex.el
index dbf23368..6bc7cd5a 100644
--- a/evil-ex.el
+++ b/evil-ex.el
@@ -3,7 +3,7 @@
 ;; Author: Frank Fischer <frank fischer at mathematik.tu-chemnitz.de>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.2.15
+;; Version: 1.2.16
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-integration.el b/evil-integration.el
index 976ef1a4..c88c126a 100644
--- a/evil-integration.el
+++ b/evil-integration.el
@@ -3,7 +3,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.2.15
+;; Version: 1.2.16
 
 ;;
 ;; This file is NOT part of GNU Emacs.
@@ -288,9 +288,9 @@ activated."
   (evil-with-state emacs ad-do-it))
 
 ;; ace-jump-mode
-(declare-function 'ace-jump-char-mode "ace-jump-mode")
-(declare-function 'ace-jump-word-mode "ace-jump-mode")
-(declare-function 'ace-jump-line-mode "ace-jump-mode")
+(declare-function ace-jump-char-mode "ext:ace-jump-mode")
+(declare-function ace-jump-word-mode "ext:ace-jump-mode")
+(declare-function ace-jump-line-mode "ext:ace-jump-mode")
 
 (defvar evil-ace-jump-active nil)
 
@@ -398,20 +398,20 @@ the mark and entering `recursive-edit'."
 (define-key evil-motion-state-map [remap ace-jump-word-mode] #'evil-ace-jump-word-mode)
 
 ;;; avy
-(declare-function 'avy-goto-word-or-subword-1 "avy")
-(declare-function 'avy-goto-line "avy")
-(declare-function 'avy-goto-char "avy")
-(declare-function 'avy-goto-char-2 "avy")
-(declare-function 'avy-goto-char-2-above "avy")
-(declare-function 'avy-goto-char-2-below "avy")
-(declare-function 'avy-goto-char-in-line "avy")
-(declare-function 'avy-goto-word-0 "avy")
-(declare-function 'avy-goto-word-1 "avy")
-(declare-function 'avy-goto-word-1-above "avy")
-(declare-function 'avy-goto-word-1-below "avy")
-(declare-function 'avy-goto-subword-0 "avy")
-(declare-function 'avy-goto-subword-1 "avy")
-(declare-function 'avy-goto-char-timer "avy")
+(declare-function avy-goto-word-or-subword-1 "ext:avy")
+(declare-function avy-goto-line "ext:avy")
+(declare-function avy-goto-char "ext:avy")
+(declare-function avy-goto-char-2 "ext:avy")
+(declare-function avy-goto-char-2-above "ext:avy")
+(declare-function avy-goto-char-2-below "ext:avy")
+(declare-function avy-goto-char-in-line "ext:avy")
+(declare-function avy-goto-word-0 "ext:avy")
+(declare-function avy-goto-word-1 "ext:avy")
+(declare-function avy-goto-word-1-above "ext:avy")
+(declare-function avy-goto-word-1-below "ext:avy")
+(declare-function avy-goto-subword-0 "ext:avy")
+(declare-function avy-goto-subword-1 "ext:avy")
+(declare-function avy-goto-char-timer "ext:avy")
 
 (defmacro evil-enclose-avy-for-motion (&rest body)
   "Enclose avy to make it suitable for motions.
diff --git a/evil-jumps.el b/evil-jumps.el
index 3eef4c8b..468ab539 100644
--- a/evil-jumps.el
+++ b/evil-jumps.el
@@ -2,7 +2,7 @@
 
 ;; Author: Bailey Ling <bling at live.ca>
 
-;; Version: 1.2.15
+;; Version: 1.2.16
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-keybindings.el b/evil-keybindings.el
index 3963c04d..fb64edb9 100644
--- a/evil-keybindings.el
+++ b/evil-keybindings.el
@@ -3,7 +3,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.2.15
+;; Version: 1.2.16
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-macros.el b/evil-macros.el
index 16a9f911..b4d0fa59 100644
--- a/evil-macros.el
+++ b/evil-macros.el
@@ -3,7 +3,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.2.15
+;; Version: 1.2.16
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-maps.el b/evil-maps.el
index 87c3d53a..abc2a82c 100644
--- a/evil-maps.el
+++ b/evil-maps.el
@@ -3,7 +3,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.2.15
+;; Version: 1.2.16
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-pkg.el b/evil-pkg.el
index 44998a2f..ff2dac54 100644
--- a/evil-pkg.el
+++ b/evil-pkg.el
@@ -1,6 +1,6 @@
 (define-package
   "evil"
-  "1.2.15"
+  "1.2.16"
   "Extensible Vi layer for Emacs."
   '((emacs "24.1")
     (undo-tree "0.6.3")
diff --git a/evil-repeat.el b/evil-repeat.el
index b47648eb..94551ba6 100644
--- a/evil-repeat.el
+++ b/evil-repeat.el
@@ -3,7 +3,7 @@
 ;; Author: Frank Fischer <frank.fischer at mathematik.tu-chemnitz.de>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.2.15
+;; Version: 1.2.16
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-search.el b/evil-search.el
index 2f48abe8..c0dac705 100644
--- a/evil-search.el
+++ b/evil-search.el
@@ -3,7 +3,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.2.15
+;; Version: 1.2.16
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-states.el b/evil-states.el
index 2b855c9b..918e46c5 100644
--- a/evil-states.el
+++ b/evil-states.el
@@ -3,7 +3,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.2.15
+;; Version: 1.2.16
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-test-helpers.el b/evil-test-helpers.el
index dcfa0022..160801c5 100644
--- a/evil-test-helpers.el
+++ b/evil-test-helpers.el
@@ -2,8 +2,8 @@
 
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
-;; Package-Requires: ((evil "1.2.15"))
-;; Version: 1.2.15
+;; Package-Requires: ((evil "1.2.16"))
+;; Version: 1.2.16
 
 ;; This file is NOT part of GNU Emacs.
 
diff --git a/evil-tests.el b/evil-tests.el
index 280b32e4..8aed42c7 100644
--- a/evil-tests.el
+++ b/evil-tests.el
@@ -3,7 +3,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.2.15
+;; Version: 1.2.16
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-types.el b/evil-types.el
index dbd737d5..769e02ed 100644
--- a/evil-types.el
+++ b/evil-types.el
@@ -3,7 +3,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.2.15
+;; Version: 1.2.16
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-vars.el b/evil-vars.el
index 6162b707..c9e6e6a4 100644
--- a/evil-vars.el
+++ b/evil-vars.el
@@ -3,7 +3,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.2.15
+;; Version: 1.2.16
 
 ;;
 ;; This file is NOT part of GNU Emacs.
@@ -1626,12 +1626,12 @@ Elements have the form (NAME . FUNCTION).")
 (defvar evil-visual-x-select-timeout 0.1
   "Time in seconds for the update of the X selection.")
 
-(declare-function origami-open-all-nodes "origami.el")
-(declare-function origami-close-all-nodes "origami.el")
-(declare-function origami-toggle-node "origami.el")
-(declare-function origami-open-node "origami.el")
-(declare-function origami-open-node-recursively "origami.el")
-(declare-function origami-close-node "origami.el")
+(declare-function origami-open-all-nodes "ext:origami.el")
+(declare-function origami-close-all-nodes "ext:origami.el")
+(declare-function origami-toggle-node "ext:origami.el")
+(declare-function origami-open-node "ext:origami.el")
+(declare-function origami-open-node-recursively "ext:origami.el")
+(declare-function origami-close-node "ext:origami.el")
 
 (defvar evil-fold-list
   `(((vdiff-mode)
@@ -1875,7 +1875,7 @@ Otherwise the previous command is assumed as substitute.")
                       (buffer-substring (point-min)
                                         (line-end-position))))
           ;; no repo, use plain version
-          "1.2.15"))))
+          "1.2.16"))))
   "The current version of Evil")
 
 (defcustom evil-want-integration t
diff --git a/evil.el b/evil.el
index e689aa8a..4aaf9079 100644
--- a/evil.el
+++ b/evil.el
@@ -55,7 +55,7 @@
 ;;      To get in touch, please use the bug tracker or the
 ;;      mailing list (see below).
 ;; Created: 2011-03-01
-;; Version: 1.2.15
+;; Version: 1.2.16
 ;; Keywords: emulation, vim
 ;; URL: https://github.com/emacs-evil/evil
 ;;      Repository: https://github.com/emacs-evil/evil.git