6 files changed, 12 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5b59ce403..85da111632 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,6 +46,7 @@ find_package(LibUV REQUIRED)
 include_directories(${LibUV_INCLUDE_DIRS})
 
 include_directories ("${PROJECT_BINARY_DIR}/config")
+include_directories ("${PROJECT_SOURCE_DIR}/src")
 
 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
diff --git a/src/os/env.c b/src/os/env.c
index 9025b1c8ac..546caa50b8 100644
--- a/src/os/env.c
+++ b/src/os/env.c
@@ -13,8 +13,8 @@
 
 #include <uv.h>
 
-#include "os.h"
-#include "../misc2.h"
+#include "os/os.h"
+#include "misc2.h"
 
 #ifdef HAVE_CRT_EXTERNS_H
 #include <crt_externs.h>
diff --git a/src/os/fs.c b/src/os/fs.c
index ee7424d745..e8525cb279 100644
--- a/src/os/fs.c
+++ b/src/os/fs.c
@@ -13,10 +13,10 @@
 
 #include <uv.h>
 
-#include "os.h"
-#include "../message.h"
-#include "../misc1.h"
-#include "../misc2.h"
+#include "os/os.h"
+#include "message.h"
+#include "misc1.h"
+#include "misc2.h"
 
 int mch_chdir(char *path) {
   if (p_verbose >= 5) {
diff --git a/src/os/mem.c b/src/os/mem.c
index 20abd58261..fa93fe8398 100644
--- a/src/os/mem.c
+++ b/src/os/mem.c
@@ -13,7 +13,7 @@
 
 #include <uv.h>
 
-#include "os.h"
+#include "os/os.h"
 
 /*
  * Return total amount of memory available in Kbyte.
diff --git a/src/os/os.h b/src/os/os.h
index eefa015a33..0d64f489cd 100644
--- a/src/os/os.h
+++ b/src/os/os.h
@@ -1,7 +1,7 @@
 #ifndef NEOVIM_OS_OS_H
 #define NEOVIM_OS_OS_H
 
-#include "../vim.h"
+#include "vim.h"
 
 long_u mch_total_mem(int special);
 int mch_chdir(char *path);
diff --git a/src/os/users.c b/src/os/users.c
index 2d33688d97..2104d8080e 100644
--- a/src/os/users.c
+++ b/src/os/users.c
@@ -13,9 +13,9 @@
 
 #include <uv.h>
 
-#include "os.h"
-#include "../garray.h"
-#include "../misc2.h"
+#include "os/os.h"
+#include "garray.h"
+#include "misc2.h"
 #ifdef HAVE_PWD_H
 # include <pwd.h>
 #endif