diff --git a/Makefile b/Makefile
index b106ad4c..d1252716 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ ifdef MSVC
 uname_S := MINGW
 endif
 
-CPPFLAGS += -Iinclude
+CPPFLAGS += -Iinclude -Iinclude/uv-private
 
 CARES_OBJS =
 CARES_OBJS += src/ares/ares__close_sockets.o
diff --git a/config-unix.mk b/config-unix.mk
index bfd1dc38..37208519 100644
--- a/config-unix.mk
+++ b/config-unix.mk
@@ -89,16 +89,16 @@ uv.a: src/uv-unix.o src/unix/fs.o src/uv-common.o src/uv-platform.o src/unix/ev/
 	$(AR) rcs uv.a src/uv-unix.o src/unix/fs.o src/uv-platform.o src/uv-common.o src/unix/uv-eio.o src/unix/ev/ev.o \
 		src/unix/eio/eio.o $(CARES_OBJS)
 
-src/uv-platform.o: src/unix/$(UV_OS_FILE) include/uv.h include/uv-unix.h
+src/uv-platform.o: src/unix/$(UV_OS_FILE) include/uv.h include/uv-private/uv-unix.h
 	$(CC) $(CSTDFLAG) $(CPPFLAGS) $(CFLAGS) -c src/unix/$(UV_OS_FILE) -o src/uv-platform.o
 
-src/uv-unix.o: src/uv-unix.c include/uv.h include/uv-unix.h src/unix/internal.h
+src/uv-unix.o: src/uv-unix.c include/uv.h include/uv-private/uv-unix.h src/unix/internal.h
 	$(CC) $(CSTDFLAG) $(CPPFLAGS) -Isrc  $(CFLAGS) -c src/uv-unix.c -o src/uv-unix.o
 
-src/unix/fs.o: src/unix/fs.c include/uv.h include/uv-unix.h src/unix/internal.h
+src/unix/fs.o: src/unix/fs.c include/uv.h include/uv-private/uv-unix.h src/unix/internal.h
 	$(CC) $(CSTDFLAG) $(CPPFLAGS) -Isrc/ $(CFLAGS) -c src/unix/fs.c -o src/unix/fs.o
 
-src/uv-common.o: src/uv-common.c include/uv.h include/uv-unix.h
+src/uv-common.o: src/uv-common.c include/uv.h include/uv-private/uv-unix.h
 	$(CC) $(CSTDFLAG) $(CPPFLAGS) $(CFLAGS) -c src/uv-common.c -o src/uv-common.o
 
 src/unix/ev/ev.o: src/unix/ev/ev.c
diff --git a/include/eio.h b/include/uv-private/eio.h
similarity index 100%
rename from include/eio.h
rename to include/uv-private/eio.h
diff --git a/include/ev.h b/include/uv-private/ev.h
similarity index 100%
rename from include/ev.h
rename to include/uv-private/ev.h
diff --git a/include/ngx-queue.h b/include/uv-private/ngx-queue.h
similarity index 100%
rename from include/ngx-queue.h
rename to include/uv-private/ngx-queue.h
diff --git a/include/tree.h b/include/uv-private/tree.h
similarity index 100%
rename from include/tree.h
rename to include/uv-private/tree.h
diff --git a/include/uv-unix.h b/include/uv-private/uv-unix.h
similarity index 100%
rename from include/uv-unix.h
rename to include/uv-private/uv-unix.h
diff --git a/include/uv-win.h b/include/uv-private/uv-win.h
similarity index 100%
rename from include/uv-win.h
rename to include/uv-private/uv-win.h
diff --git a/include/uv.h b/include/uv.h
index 4ba5bd64..a64f18e7 100644
--- a/include/uv.h
+++ b/include/uv.h
@@ -67,9 +67,9 @@ typedef struct uv_fs_s uv_fs_t;
 typedef struct uv_work_s uv_work_t;
 
 #if defined(__unix__) || defined(__POSIX__) || defined(__APPLE__)
-# include "uv-unix.h"
+# include "uv-private/uv-unix.h"
 #else
-# include "uv-win.h"
+# include "uv-private/uv-win.h"
 #endif
 
 
diff --git a/uv.gyp b/uv.gyp
index f836c5ee..d345a59d 100644
--- a/uv.gyp
+++ b/uv.gyp
@@ -5,6 +5,7 @@
       'type': '<(library)',
       'include_dirs': [
         'include',
+        'include/uv-private',
         'src/',
       ],
       'direct_dependent_settings': {
@@ -94,8 +95,8 @@
             '_GNU_SOURCE',
           ],
           'sources': [
-            'include/tree.h',
-            'include/uv-win.h',
+            'include/uv-private/tree.h',
+            'include/uv-private/uv-win.h',
             'src/ares/config_win32/ares_config.h',
             'src/win/async.c',
             'src/win/cares.c',
@@ -136,10 +137,10 @@
             '-Wno-unused-parameter'
           ],
           'sources': [
-            'include/eio.h',
-            'include/ev.h',
-            'include/ngx-queue.h',
-            'include/uv-unix.h',
+            'include/uv-private/eio.h',
+            'include/uv-private/ev.h',
+            'include/uv-private/ngx-queue.h',
+            'include/uv-private/uv-unix.h',
             'src/uv-unix.c',
             'src/unix/uv-eio.c',
             'src/unix/uv-eio.h',