4 files changed, 6 insertions, 5 deletions
diff --git a/test/includes/CMakeLists.txt b/test/includes/CMakeLists.txt
index a139683b42..3d85197f19 100644
--- a/test/includes/CMakeLists.txt
+++ b/test/includes/CMakeLists.txt
@@ -8,6 +8,7 @@ foreach(hfile ${PRE_HEADERS})
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${post_hfile}
     COMMAND ${CMAKE_C_COMPILER} -std=c99 -E -P
       ${CMAKE_CURRENT_SOURCE_DIR}/${hfile}
+      -I${LIBUV_INCLUDE_DIRS}
       -o ${CMAKE_CURRENT_BINARY_DIR}/${post_hfile})
   list(APPEND POST_HEADERS ${post_hfile})
 endforeach()
diff --git a/test/includes/pre/sys/fcntl.h b/test/includes/pre/fcntl.h
index 767c97a631..9c50ed5b1d 100644
--- a/test/includes/pre/sys/fcntl.h
+++ b/test/includes/pre/fcntl.h
@@ -1,4 +1,4 @@
-#include <sys/fcntl.h>
+#include <fcntl.h>
 
 static const mode_t kO_RDONLY = O_RDONLY;
 static const mode_t kO_WRONLY = O_WRONLY;
diff --git a/test/includes/pre/sys/errno.h b/test/includes/pre/sys/errno.h
deleted file mode 100644
index 0b8934d33e..0000000000
--- a/test/includes/pre/sys/errno.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <sys/errno.h>
-
-static const int kENOENT = ENOENT;
-static const int kEEXIST = EEXIST;
diff --git a/test/includes/pre/uv-errno.h b/test/includes/pre/uv-errno.h
new file mode 100644
index 0000000000..6b80f60e5c
--- /dev/null
+++ b/test/includes/pre/uv-errno.h
@@ -0,0 +1,4 @@
+#include <uv-errno.h>
+
+static const int kUV_ENOENT = UV_ENOENT;
+static const int kUV_EEXIST = UV_EEXIST;