diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 48aa9250fe2fa5..49c0ef42cb257a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,7 @@ file( GLOB IO_SOURCES io/*.c )
 
 add_executable (vim ${NEOVIM_SOURCES} ${IO_SOURCES}) 
 
-target_link_libraries (vim m)
+target_link_libraries (vim m uv rt pthread)
 
 include(CheckLibraryExists)
 check_library_exists(termcap tgetent "" HAVE_LIBTERMCAP)
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 0162031b75d709..209fcddd6720c0 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -3394,10 +3394,10 @@ void set_lang_var()          {
 
   /* When LC_MESSAGES isn't defined use the value from $LC_MESSAGES, fall
    * back to LC_CTYPE if it's empty. */
-# if defined(HAVE_GET_LOCALE_VAL) && defined(LC_MESSAGES)
-  loc = (char_u *)get_locale_val(LC_MESSAGES);
-# else
+# ifdef HAVE_WORKING_LIBINTL
   loc = get_mess_env();
+# else
+  loc = (char_u *)get_locale_val(LC_MESSAGES);
 # endif
   set_vim_var_string(VV_LANG, loc, -1);
 
@@ -3448,7 +3448,7 @@ exarg_T     *eap;
   }
 
   if (*name == NUL) {
-#ifndef LC_MESSAGES
+#ifdef HAVE_WORKING_LIBINTL
     if (what == VIM_LC_MESSAGES)
       p = get_mess_env();
     else
diff --git a/src/getchar.c b/src/getchar.c
index 134f6d175b2b6c..92e1ece639d10d 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -4249,12 +4249,6 @@ int         *local_ptr;         /* return: buffer-local mapping or NULL */
 }
 
 
-/*
- * Set up default mappings.
- */
-void init_mappings()          {
-}
-
 #if defined(MSDOS) || defined(MSWIN) || defined(OS2) \
   || defined(FEAT_CMDWIN) || defined(MACOS) || defined(PROTO)
 /*
diff --git a/src/main.c b/src/main.c
index 0c06781be857b3..02da51fb5973a7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -320,8 +320,6 @@ main(argc, argv)
   msg_scroll = TRUE;
   no_wait_return = TRUE;
 
-  init_mappings();              /* set up initial mappings */
-
   init_highlight(TRUE, FALSE);   /* set the default highlight groups */
   TIME_MSG("init highlight");