6 files changed, 17 insertions, 6 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index da14a97e04..336bdf4e8a 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -17,6 +17,9 @@
 
 #include "nvim/vim.h"
 #include "nvim/ascii.h"
+#ifdef HAVE_LOCALE_H
+# include <locale.h>
+#endif
 #include "nvim/eval.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index cada3c5818..ea027ba225 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -15,6 +15,9 @@
 
 #include "nvim/vim.h"
 #include "nvim/ascii.h"
+#ifdef HAVE_LOCALE_H
+# include <locale.h>
+#endif
 #include "nvim/version_defs.h"
 #include "nvim/ex_cmds2.h"
 #include "nvim/buffer.h"
diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c
index bc81a4b428..dedddfb30b 100644
--- a/src/nvim/hardcopy.c
+++ b/src/nvim/hardcopy.c
@@ -14,6 +14,9 @@
 
 #include "nvim/vim.h"
 #include "nvim/ascii.h"
+#ifdef HAVE_LOCALE_H
+# include <locale.h>
+#endif
 #include "nvim/version_defs.h"
 #include "nvim/hardcopy.h"
 #include "nvim/buffer.h"
diff --git a/src/nvim/main.c b/src/nvim/main.c
index f24c0dab4d..d1c968b511 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -25,6 +25,9 @@
 #include "nvim/getchar.h"
 #include "nvim/hashtab.h"
 #include "nvim/if_cscope.h"
+#ifdef HAVE_LOCALE_H
+# include <locale.h>
+#endif
 #include "nvim/mark.h"
 #include "nvim/mbyte.h"
 #include "nvim/memline.h"
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
index 5b93ecf13f..3b36e53f66 100644
--- a/src/nvim/mbyte.c
+++ b/src/nvim/mbyte.c
@@ -77,10 +77,13 @@
  */
 
 #include <string.h>
-# include <wchar.h>
+#include <wchar.h>
 
 #include "nvim/vim.h"
 #include "nvim/ascii.h"
+#ifdef HAVE_LOCALE_H
+# include <locale.h>
+#endif
 #include "nvim/mbyte.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
@@ -99,7 +102,7 @@
 #include "nvim/os/os.h"
 #include "nvim/arabic.h"
 
-# define WINBYTE BYTE
+#define WINBYTE BYTE
 
 typedef struct {
   int rangeStart;
diff --git a/src/nvim/vim.h b/src/nvim/vim.h
index 3a848f4f26..d927c299cb 100644
--- a/src/nvim/vim.h
+++ b/src/nvim/vim.h
@@ -44,10 +44,6 @@ Error: configure did not run properly.Check auto/config.log.
 
 #include "nvim/os_unix_defs.h"       /* bring lots of system header files */
 
-# ifdef HAVE_LOCALE_H
-#  include <locale.h>
-# endif
-
 /*
  * Maximum length of a path (for non-unix systems) Make it a bit long, to stay
  * on the safe side.  But not too long to put on the stack.