Index: neovim-0.2.1/src/nvim/ex_cmds.c
===================================================================
--- neovim-0.2.1.orig/src/nvim/ex_cmds.c
+++ neovim-0.2.1/src/nvim/ex_cmds.c
@@ -109,6 +109,8 @@ typedef struct {
 # include "ex_cmds.c.generated.h"
 #endif
 
+bool do_sub_msg(bool count_only);
+
 /*
  * ":ascii" and "ga".
  */
Index: neovim-0.2.1/src/nvim/normal.c
===================================================================
--- neovim-0.2.1.orig/src/nvim/normal.c
+++ neovim-0.2.1/src/nvim/normal.c
@@ -62,6 +62,22 @@
 #include "nvim/os/time.h"
 #include "nvim/os/input.h"
 
+bool
+find_decl (
+    char_u *ptr,
+    size_t len,
+    bool locally,
+    bool thisblock,
+    int flags_arg
+);
+
+bool
+get_visual_text (
+    cmdarg_T *cap,
+    char_u **pp,
+    size_t *lenp
+);
+
 typedef struct normal_state {
   VimState state;
   linenr_T conceal_old_cursor_line;