build: switch to autotools

Switch to the build tool everyone loves to hate.  The Makefile has
served us well over the years but it's been acquiring more and more
features that autotools gives us for free, like easy static+shared
library building, sane install targets, and so on.

This commit drops MinGW support.  If there is demand for it, we'll
re-add it.

26 files changed, 337 insertions, 576 deletions

diff --git a/.gitignore b/.gitignore
index 3f4c5193..396f30b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,8 +9,28 @@ core
 vgcore.*
 .buildstamp
 
-/libuv.so
+/.deps/
+/.libs/
+/aclocal.m4
+/ar-lib
+/autom4te.cache/
+/config.guess
+/config.log
+/config.status
+/config.sub
+/configure
+/depcomp
+/install-sh
+/libtool
+/libuv.a
 /libuv.dylib
+/libuv.pc
+/libuv.so
+/ltmain.sh
+/missing
+/test-driver
+Makefile
+Makefile.in
 
 # Generated by dtrace(1) when doing an in-tree build.
 /src/unix/uv-dtrace.h
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 1584e670..00000000
--- a/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright Joyent, Inc. and other Node contributors. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-SRCDIR ?= $(CURDIR)
-
-ifeq (,$(builddir_name))
-
-VPATH := $(SRCDIR)
-include $(SRCDIR)/build.mk
-
-else  # Out of tree build.
-
-# Drop all built-in rules.
-.SUFFIXES:
-
-.PHONY:	$(builddir_name)
-$(builddir_name): $(builddir_name)/.buildstamp
-	$(MAKE) -C $@ -f $(CURDIR)/Makefile $(MAKECMDGOALS) \
-		SRCDIR=$(CURDIR) builddir_name=
-
-$(builddir_name)/.buildstamp:
-	mkdir -p $(dir $@)
-	touch $@
-
-# Add no-op rules for Makefiles to stop make from trying to rebuild them.
-Makefile:: ;
-%.mk:: ;
-
-# Turn everything else into a no-op rule that depends on the build directory.
-%:: $(builddir_name) ;
-
-.PHONY: clean distclean
-clean distclean:
-	$(RM) -fr $(builddir_name)
-
-endif
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 00000000..df911d00
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,191 @@
+# Copyright (c) 2013, Ben Noordhuis <info@bnoordhuis.nl>
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ACLOCAL_AMFLAGS = -I m4
+
+AM_CPPFLAGS = -I$(top_srcdir)/include \
+              -I$(top_srcdir)/src/unix \
+              -I$(top_srcdir)/src
+
+include_HEADERS=include/uv.h include/uv-unix.h
+
+lib_LTLIBRARIES = libuv.la
+libuv_la_CFLAGS = @CFLAGS@
+libuv_la_LDFLAGS = -no-undefined -version-info 11:0:0
+libuv_la_SOURCES = src/fs-poll.c \
+                   src/inet.c \
+                   src/uv-common.c \
+                   src/uv-common.h \
+                   src/version.c \
+                   src/unix/async.c \
+                   src/unix/core.c \
+                   src/unix/dl.c \
+                   src/unix/error.c \
+                   src/unix/fs.c \
+                   src/unix/getaddrinfo.c \
+                   src/unix/internal.h \
+                   src/unix/loop-watcher.c \
+                   src/unix/loop.c \
+                   src/unix/pipe.c \
+                   src/unix/poll.c \
+                   src/unix/process.c \
+                   src/unix/signal.c \
+                   src/unix/stream.c \
+                   src/unix/tcp.c \
+                   src/unix/thread.c \
+                   src/unix/threadpool.c \
+                   src/unix/timer.c \
+                   src/unix/tty.c \
+                   src/unix/udp.c
+
+TESTS = test/run-tests
+check_PROGRAMS = test/run-tests
+test_run_tests_SOURCES = test/blackhole-server.c \
+                         test/dns-server.c \
+                         test/echo-server.c \
+                         test/run-tests.c \
+                         test/runner-unix.c \
+                         test/runner-unix.h \
+                         test/runner.c \
+                         test/runner.h \
+                         test/task.h \
+                         test/test-active.c \
+                         test/test-async.c \
+                         test/test-barrier.c \
+                         test/test-callback-order.c \
+                         test/test-callback-stack.c \
+                         test/test-condvar.c \
+                         test/test-connection-fail.c \
+                         test/test-cwd-and-chdir.c \
+                         test/test-delayed-accept.c \
+                         test/test-dlerror.c \
+                         test/test-embed.c \
+                         test/test-error.c \
+                         test/test-fail-always.c \
+                         test/test-fs-event.c \
+                         test/test-fs-poll.c \
+                         test/test-fs.c \
+                         test/test-get-currentexe.c \
+                         test/test-get-loadavg.c \
+                         test/test-get-memory.c \
+                         test/test-getaddrinfo.c \
+                         test/test-getsockname.c \
+                         test/test-hrtime.c \
+                         test/test-idle.c \
+                         test/test-ipc-send-recv.c \
+                         test/test-ipc.c \
+                         test/test-list.h \
+                         test/test-loop-handles.c \
+                         test/test-loop-stop.c \
+                         test/test-multiple-listen.c \
+                         test/test-mutexes.c \
+                         test/test-osx-select.c \
+                         test/test-pass-always.c \
+                         test/test-ping-pong.c \
+                         test/test-pipe-bind-error.c \
+                         test/test-pipe-connect-error.c \
+                         test/test-platform-output.c \
+                         test/test-poll-close.c \
+                         test/test-poll.c \
+                         test/test-process-title.c \
+                         test/test-ref.c \
+                         test/test-run-nowait.c \
+                         test/test-run-once.c \
+                         test/test-semaphore.c \
+                         test/test-shutdown-close.c \
+                         test/test-shutdown-eof.c \
+                         test/test-signal-multiple-loops.c \
+                         test/test-signal.c \
+                         test/test-spawn.c \
+                         test/test-stdio-over-pipes.c \
+                         test/test-tcp-bind-error.c \
+                         test/test-tcp-bind6-error.c \
+                         test/test-tcp-close-while-connecting.c \
+                         test/test-tcp-close.c \
+                         test/test-tcp-connect-error-after-write.c \
+                         test/test-tcp-connect-error.c \
+                         test/test-tcp-connect-timeout.c \
+                         test/test-tcp-connect6-error.c \
+                         test/test-tcp-flags.c \
+                         test/test-tcp-open.c \
+                         test/test-tcp-read-stop.c \
+                         test/test-tcp-shutdown-after-write.c \
+                         test/test-tcp-unexpected-read.c \
+                         test/test-tcp-write-to-half-open-connection.c \
+                         test/test-tcp-writealot.c \
+                         test/test-thread.c \
+                         test/test-threadpool-cancel.c \
+                         test/test-threadpool.c \
+                         test/test-timer-again.c \
+                         test/test-timer-from-check.c \
+                         test/test-timer.c \
+                         test/test-tty.c \
+                         test/test-udp-dgram-too-big.c \
+                         test/test-udp-ipv6.c \
+                         test/test-udp-multicast-join.c \
+                         test/test-udp-multicast-ttl.c \
+                         test/test-udp-open.c \
+                         test/test-udp-options.c \
+                         test/test-udp-send-and-recv.c \
+                         test/test-util.c \
+                         test/test-walk-handles.c
+test_run_tests_LDADD = libuv.la
+
+if AIX
+libuv_la_CFLAGS += -D_ALL_SOURCE -D_XOPEN_SOURCE=500
+libuv_la_SOURCES += src/unix/aix.c
+endif
+
+if DARWIN
+include_HEADERS += include/uv-darwin.h
+libuv_la_CFLAGS += -D_DARWIN_USE_64_BIT_INODE=1
+libuv_la_SOURCES += src/unix/darwin.c \
+                    src/unix/darwin-proctitle.c \
+                    src/unix/fsevents.c \
+                    src/unix/kqueue.c \
+                    src/unix/proctitle.c
+libuv_la_LDFLAGS += -framework ApplicationServices \
+                    -framework CoreServices \
+                    -framework Foundation
+endif
+
+if FREEBSD
+include_HEADERS += include/uv-bsd.h
+libuv_la_SOURCES += src/unix/freebsd.c src/unix/kqueue.c
+endif
+
+if LINUX
+include_HEADERS += include/uv-linux.h
+libuv_la_SOURCES += src/unix/linux-core.c \
+                    src/unix/linux-inotify.c \
+                    src/unix/linux-syscalls.c \
+                    src/unix/linux-syscalls.h \
+                    src/unix/proctitle.c
+endif
+
+if NETBSD
+include_HEADERS += include/uv-bsd.h
+libuv_la_SOURCES += src/unix/kqueue.c src/unix/netbsd.c
+endif
+
+if OPENBSD
+include_HEADERS += include/uv-bsd.h
+libuv_la_SOURCES += src/unix/kqueue.c src/unix/openbsd.c
+endif
+
+if SUNOS
+include_HEADERS += include/uv-sunos.h
+libuv_la_CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=500
+libuv_la_SOURCES += src/unix/sunos.c
+endif
diff --git a/README.md b/README.md
index f4f3ce2c..48a86266 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,9 @@
 # libuv
 
-libuv is a new platform layer for Node. Its purpose is to abstract IOCP on
-Windows and epoll/kqueue/event ports/etc. on Unix systems. We intend to
+libuv is a platform layer for [node.js][]. Its purpose is to abstract IOCP
+on Windows and epoll/kqueue/event ports/etc. on Unix systems. We intend to
 eventually contain all platform differences in this library.
 
-http://nodejs.org/
-
 ## Features
 
  * Non-blocking TCP sockets
@@ -30,9 +28,8 @@ http://nodejs.org/
 
  * ANSI escape code controlled TTY `uv_tty_t`
 
- * File system events Currently supports inotify, `ReadDirectoryChangesW`
-   and kqueue. Event ports in the near future.
-   `uv_fs_event_t`
+ * File system events using inotify, kqueue, event ports,
+   FSEvents and `ReadDirectoryChangesW`
 
  * IPC and socket sharing between processes `uv_write2`
 
@@ -53,55 +50,46 @@ http://nodejs.org/
 
 ## Build Instructions
 
-For GCC (including MinGW) there are two methods building: via normal
-makefiles or via GYP. GYP is a meta-build system which can generate MSVS,
-Makefile, and XCode backends. It is best used for integration into other
-projects.  The old system is using plain GNU Makefiles.
-
-To build via Makefile simply execute:
-
-    make
-
-MinGW users should run this instead:
-
-    make PLATFORM=mingw
-
-Out-of-tree builds are supported:
+For GCC there are two methods building: via autotools or via [GYP][].
+GYP is a meta-build system which can generate MSVS, Makefile, and XCode
+backends. It is best used for integration into other projects.
 
-    make builddir_name=/path/to/builddir
+To build with autotools:
 
-To build a shared object:
-
-    make libuv.so  # libuv.dylib on OS X
+    $ sh autogen.sh
+    $ ./configure
+    $ make
+    $ make check
+    $ make install
 
 To build with Visual Studio run the vcbuild.bat file which will
 checkout the GYP code into build/gyp and generate the uv.sln and
 related files.
 
-Windows users can also build from cmd-line using msbuild.  This is
-done by running vcbuild.bat from Visual Studio command prompt.
+Windows users can also build from the command line using msbuild.
+This is done by running vcbuild.bat from Visual Studio command prompt.
 
 To have GYP generate build script for another system, make sure that
 you have Python 2.6 or 2.7 installed, then checkout GYP into the
 project tree manually:
 
-    mkdir -p build
-    svn co http://gyp.googlecode.com/svn/trunk build/gyp
+    $ mkdir -p build
+    $ git clone https://git.chromium.org/external/gyp.git build/gyp
 
-Or:
+Unix users run:
 
-    mkdir -p build
-    git clone https://git.chromium.org/external/gyp.git build/gyp
+    $ ./gyp_uv -f make
+    $ make -C out
 
-Unix users run
+Macintosh users run:
 
-    ./gyp_uv -f make
-    make -C out
+    $ ./gyp_uv -f xcode
+    $ xcodebuild -project uv.xcodeproj -configuration Release -target All
 
-Macintosh users run
+To build for android:
 
-    ./gyp_uv -f xcode
-    xcodebuild -project uv.xcodeproj -configuration Release -target All
+    $ source ./android-configure NDK_PATH gyp
+    $ make -C out
 
 Note for UNIX users: compile your project with `-D_LARGEFILE_SOURCE` and
 `-D_FILE_OFFSET_BITS=64`. GYP builds take care of that automatically.
@@ -110,16 +98,6 @@ Note for Linux users: compile your project with `-D_GNU_SOURCE` when you
 include `uv.h`. GYP builds take care of that automatically. If you use
 autotools, add a `AC_GNU_SOURCE` declaration to your `configure.ac`.
 
-To build for android, locate your android NDK path, then run:
-
-    source ./android-configure NDK_PATH
-    make
-
-To build for android with gyp, add "gyp" to the configuration:
-
-    source ./android-configure NDK_PATH gyp
-    make -C out
-
 ## Supported Platforms
 
 Microsoft Windows operating systems since Windows XP SP2. It can be built
@@ -127,10 +105,12 @@ with either Visual Studio or MinGW. Consider using
 [Visual Studio Express 2010][] or later if you do not have a full Visual
 Studio license.
 
-Linux 2.6 using the GCC toolchain.
+Linux using the GCC toolchain.
 
 MacOS using the GCC or XCode toolchain.
 
 Solaris 121 and later using GCC toolchain.
 
+[node.js]: http://nodejs.org/
+[GYP]: http://code.google.com/p/gyp/
 [Visual Studio Express 2010]: http://www.microsoft.com/visualstudio/eng/products/visual-studio-2010-express
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 00000000..c8791e39
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# Copyright (c) 2013, Ben Noordhuis <info@bnoordhuis.nl>
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+if [ "$LIBTOOLIZE" == "" ] && [ "`uname`" == "Darwin" ]; then
+  LIBTOOLIZE=glibtoolize
+fi
+
+set -ex
+${LIBTOOLIZE:-libtoolize}
+${ACLOCAL:-aclocal}
+${AUTOCONF:-autoconf}
+${AUTOMAKE:-automake} --add-missing
diff --git a/build.mk b/build.mk
deleted file mode 100644
index 70d141a7..00000000
--- a/build.mk
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright Joyent, Inc. and other Node contributors. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-ifdef PLATFORM
-override PLATFORM := $(shell echo $(PLATFORM) | tr "[A-Z]" "[a-z]")
-else
-PLATFORM = $(shell sh -c 'uname -s | tr "[A-Z]" "[a-z]"')
-endif
-
-CPPFLAGS += -I$(SRCDIR)/include -I$(SRCDIR)/include/uv-private
-
-ifeq (darwin,$(PLATFORM))
-SOEXT = dylib
-else
-SOEXT = so
-endif
-
-ifndef PREFIX
-PREFIX=/usr/local
-endif
-
-ifneq (,$(findstring mingw,$(PLATFORM)))
-include $(SRCDIR)/config-mingw.mk
-else
-include $(SRCDIR)/config-unix.mk
-endif
-
-BENCHMARKS= \
-	test/benchmark-async-pummel.o \
-	test/benchmark-async.o \
-	test/benchmark-fs-stat.o \
-	test/benchmark-getaddrinfo.o \
-	test/benchmark-loop-count.o \
-	test/benchmark-million-async.o \
-	test/benchmark-million-timers.o \
-	test/benchmark-multi-accept.o \
-	test/benchmark-ping-pongs.o \
-	test/benchmark-pound.o \
-	test/benchmark-pump.o \
-	test/benchmark-sizes.o \
-	test/benchmark-spawn.o \
-	test/benchmark-tcp-write-batch.o \
-	test/benchmark-thread.o \
-	test/benchmark-udp-pummel.o \
-	test/blackhole-server.o \
-	test/dns-server.o \
-	test/echo-server.o \
-
-TESTS= \
-	test/blackhole-server.o \
-	test/dns-server.o \
-	test/echo-server.o \
-	test/test-active.o \
-	test/test-async.o \
-	test/test-barrier.o \
-	test/test-callback-order.o \
-	test/test-callback-stack.o \
-	test/test-condvar.o \
-	test/test-connection-fail.o \
-	test/test-cwd-and-chdir.o \
-	test/test-delayed-accept.o \
-	test/test-dlerror.o \
-	test/test-embed.o \
-	test/test-error.o \
-	test/test-fail-always.o \
-	test/test-fs.o \
-	test/test-fs-event.o \
-	test/test-fs-poll.o \
-	test/test-getaddrinfo.o \
-	test/test-get-currentexe.o \
-	test/test-get-loadavg.o \
-	test/test-get-memory.o \
-	test/test-getsockname.o \
-	test/test-hrtime.o \
-	test/test-idle.o \
-	test/test-ipc.o \
-	test/test-ipc-send-recv.o \
-	test/test-loop-handles.o \
-	test/test-loop-stop.o \
-	test/test-multiple-listen.o \
-	test/test-mutexes.o \
-	test/test-osx-select.o \
-	test/test-pass-always.o \
-	test/test-ping-pong.o \
-	test/test-pipe-bind-error.o \
-	test/test-pipe-connect-error.o \
-	test/test-platform-output.o \
-	test/test-poll.o \
-	test/test-poll-close.o \
-	test/test-process-title.o \
-	test/test-ref.o \
-	test/test-run-nowait.o \
-	test/test-run-once.o \
-	test/test-semaphore.o \
-	test/test-shutdown-close.o \
-	test/test-shutdown-eof.o \
-	test/test-signal.o \
-	test/test-signal-multiple-loops.o \
-	test/test-spawn.o \
-	test/test-stdio-over-pipes.o \
-	test/test-tcp-bind6-error.o \
-	test/test-tcp-bind-error.o \
-	test/test-tcp-close.o \
-	test/test-tcp-close-while-connecting.o \
-	test/test-tcp-connect6-error.o \
-	test/test-tcp-connect-error-after-write.o \
-	test/test-tcp-connect-error.o \
-	test/test-tcp-connect-timeout.o \
-	test/test-tcp-flags.o \
-	test/test-tcp-open.o \
-	test/test-tcp-read-stop.o \
-	test/test-tcp-shutdown-after-write.o \
-	test/test-tcp-unexpected-read.o \
-	test/test-tcp-writealot.o \
-	test/test-tcp-write-to-half-open-connection.o \
-	test/test-thread.o \
-	test/test-threadpool.o \
-	test/test-threadpool-cancel.o \
-	test/test-timer-again.o \
-	test/test-timer-from-check.o \
-	test/test-timer.o \
-	test/test-tty.o \
-	test/test-udp-dgram-too-big.o \
-	test/test-udp-ipv6.o \
-	test/test-udp-multicast-join.o \
-	test/test-udp-multicast-ttl.o \
-	test/test-udp-open.o \
-	test/test-udp-options.o \
-	test/test-udp-send-and-recv.o \
-	test/test-util.o \
-	test/test-walk-handles.o \
-
-.PHONY: all bench clean clean-platform distclean test
-
-run-tests$(E): test/run-tests.o test/runner.o $(RUNNER_SRC) $(TESTS) libuv.a
-	$(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) -o $@ $^ $(RUNNER_LIBS) $(RUNNER_LDFLAGS)
-
-run-benchmarks$(E): test/run-benchmarks.o test/runner.o $(RUNNER_SRC) $(BENCHMARKS) libuv.a
-	$(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) -o $@ $^ $(RUNNER_LIBS) $(RUNNER_LDFLAGS)
-
-test/echo.o: test/echo.c test/echo.h
-
-test: run-tests$(E)
-	$(CURDIR)/$<
-
-bench: run-benchmarks$(E)
-	$(CURDIR)/$<
-
-clean distclean: clean-platform
-	$(RM) libuv.a libuv.$(SOEXT) \
-		test/run-tests.o test/run-benchmarks.o \
-		test/runner.o run-tests$(E) test/run-benchmarks$(E) \
-		$(BENCHMARKS) $(TESTS) $(RUNNER_LIBS)
-
-install: all
-	install -m 644 libuv.a $(PREFIX)/lib
-	install -m 755 libuv.$(SOEXT) $(PREFIX)/lib
-	install -m 644 $(SRCDIR)/include/uv.h $(PREFIX)/include
-	install -m 755 -d $(PREFIX)/include/uv-private
-	install -m 644 $(SRCDIR)/include/uv-private/pthread-fixes.h $(PREFIX)/include/uv-private
-	install -m 644 $(SRCDIR)/include/uv-private/stdint-msvc2008.h $(PREFIX)/include/uv-private
-	install -m 644 $(SRCDIR)/include/uv-private/tree.h $(PREFIX)/include/uv-private
-	install -m 644 $(SRCDIR)/include/uv-private/uv-bsd.h $(PREFIX)/include/uv-private
-	install -m 644 $(SRCDIR)/include/uv-private/uv-darwin.h $(PREFIX)/include/uv-private
-	install -m 644 $(SRCDIR)/include/uv-private/uv-linux.h $(PREFIX)/include/uv-private
-	install -m 644 $(SRCDIR)/include/uv-private/uv-sunos.h $(PREFIX)/include/uv-private
-	install -m 644 $(SRCDIR)/include/uv-private/uv-unix.h $(PREFIX)/include/uv-private
-	install -m 644 $(SRCDIR)/include/uv-private/uv-win.h $(PREFIX)/include/uv-private
diff --git a/checksparse.sh b/checksparse.sh
index 65ff72b5..0da9a15a 100755
--- a/checksparse.sh
+++ b/checksparse.sh
@@ -22,13 +22,12 @@ SPARSE_FLAGS=${SPARSE_FLAGS:-"
 -Wno-do-while
 -Wno-transparent-union
 -Iinclude
--Iinclude/uv-private
 -Isrc
 "}
 
 SOURCES="
-include/uv-private/tree.h
-include/uv-private/uv-unix.h
+include/tree.h
+include/uv-unix.h
 include/uv.h
 src/fs-poll.c
 src/inet.c
@@ -172,7 +171,7 @@ AIX)
 Darwin)
   SPARSE_FLAGS="$SPARSE_FLAGS -D__APPLE__=1"
   SOURCES="$SOURCES
-           include/uv-private/uv-bsd.h
+           include/uv-bsd.h
            src/unix/darwin.c
            src/unix/kqueue.c
            src/unix/fsevents.c"
@@ -180,21 +179,21 @@ Darwin)
 DragonFly)
   SPARSE_FLAGS="$SPARSE_FLAGS -D__DragonFly__=1"
   SOURCES="$SOURCES
-           include/uv-private/uv-bsd.h
+           include/uv-bsd.h
            src/unix/kqueue.c
            src/unix/freebsd.c"
   ;;
 FreeBSD)
   SPARSE_FLAGS="$SPARSE_FLAGS -D__FreeBSD__=1"
   SOURCES="$SOURCES
-           include/uv-private/uv-bsd.h
+           include/uv-bsd.h
            src/unix/kqueue.c
            src/unix/freebsd.c"
   ;;
 Linux)
   SPARSE_FLAGS="$SPARSE_FLAGS -D__linux__=1"
   SOURCES="$SOURCES
-           include/uv-private/uv-linux.h
+           include/uv-linux.h
            src/unix/linux-inotify.c
            src/unix/linux-core.c
            src/unix/linux-syscalls.c
@@ -203,21 +202,21 @@ Linux)
 NetBSD)
   SPARSE_FLAGS="$SPARSE_FLAGS -D__NetBSD__=1"
   SOURCES="$SOURCES
-           include/uv-private/uv-bsd.h
+           include/uv-bsd.h
            src/unix/kqueue.c
            src/unix/netbsd.c"
   ;;
 OpenBSD)
   SPARSE_FLAGS="$SPARSE_FLAGS -D__OpenBSD__=1"
   SOURCES="$SOURCES
-           include/uv-private/uv-bsd.h
+           include/uv-bsd.h
            src/unix/kqueue.c
            src/unix/openbsd.c"
   ;;
 SunOS)
   SPARSE_FLAGS="$SPARSE_FLAGS -D__sun=1"
   SOURCES="$SOURCES
-           include/uv-private/uv-sunos.h
+           include/uv-sunos.h
            src/unix/sunos.c"
   ;;
 esac
diff --git a/config-mingw.mk b/config-mingw.mk
deleted file mode 100644
index 84df27a1..00000000
--- a/config-mingw.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright Joyent, Inc. and other Node contributors. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-# Use make -f Makefile.gcc PREFIX=i686-w64-mingw32-
-# for cross compilation
-CC = $(PREFIX)gcc
-AR = $(PREFIX)ar
-E=.exe
-
-CFLAGS=$(CPPFLAGS) -g --std=gnu89 -D_WIN32_WINNT=0x0600
-LDFLAGS=-lm
-
-WIN_SRCS=$(wildcard $(SRCDIR)/src/win/*.c)
-WIN_OBJS=$(WIN_SRCS:.c=.o)
-
-RUNNER_CFLAGS=$(CFLAGS) -D_GNU_SOURCE # Need _GNU_SOURCE for strdup?
-RUNNER_LDFLAGS=$(LDFLAGS)
-RUNNER_LIBS=-lws2_32 -lpsapi -liphlpapi
-RUNNER_SRC=test/runner-win.c
-
-libuv.a: $(WIN_OBJS) src/fs-poll.o src/inet.o src/uv-common.o src/version.o
-	$(AR) rcs $@ $^
-
-src/%.o: src/%.c include/uv.h include/uv-private/uv-win.h
-	$(CC) $(CFLAGS) -c $< -o $@
-
-src/win/%.o: src/win/%.c include/uv.h include/uv-private/uv-win.h src/win/internal.h
-	$(CC) $(CFLAGS) -o $@ -c $<
-
-clean-platform:
-	-rm -f src/win/*.o
diff --git a/config-unix.mk b/config-unix.mk
deleted file mode 100644
index fbf88985..00000000
--- a/config-unix.mk
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright Joyent, Inc. and other Node contributors. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-E=
-CFLAGS += -g -Wall -Wextra -Wno-unused-parameter
-CPPFLAGS += -I$(SRCDIR)/src
-LDFLAGS=-lm
-
-CPPFLAGS += -D_LARGEFILE_SOURCE
-CPPFLAGS += -D_FILE_OFFSET_BITS=64
-
-RUNNER_SRC=test/runner-unix.c
-RUNNER_CFLAGS=$(CFLAGS) -I$(SRCDIR)/test
-RUNNER_LDFLAGS=
-
-DTRACE_OBJS=
-DTRACE_HEADER=
-
-OBJS += src/unix/async.o
-OBJS += src/unix/core.o
-OBJS += src/unix/dl.o
-OBJS += src/unix/error.o
-OBJS += src/unix/fs.o
-OBJS += src/unix/getaddrinfo.o
-OBJS += src/unix/loop.o
-OBJS += src/unix/loop-watcher.o
-OBJS += src/unix/pipe.o
-OBJS += src/unix/poll.o
-OBJS += src/unix/process.o
-OBJS += src/unix/signal.o
-OBJS += src/unix/stream.o
-OBJS += src/unix/tcp.o
-OBJS += src/unix/thread.o
-OBJS += src/unix/threadpool.o
-OBJS += src/unix/timer.o
-OBJS += src/unix/tty.o
-OBJS += src/unix/udp.o
-OBJS += src/fs-poll.o
-OBJS += src/uv-common.o
-OBJS += src/inet.o
-OBJS += src/version.o
-
-ifeq (sunos,$(PLATFORM))
-HAVE_DTRACE ?= 1
-CPPFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=500
-LDFLAGS+=-lkstat -lnsl -lsendfile -lsocket
-# Library dependencies are not transitive.
-OBJS += src/unix/sunos.o
-ifeq (1, $(HAVE_DTRACE))
-OBJS += src/unix/dtrace.o
-DTRACE_OBJS += src/unix/core.o
-endif
-endif
-
-ifeq (aix,$(PLATFORM))
-CPPFLAGS += -D_ALL_SOURCE -D_XOPEN_SOURCE=500
-LDFLAGS+= -lperfstat
-OBJS += src/unix/aix.o
-endif
-
-ifeq (darwin,$(PLATFORM))
-HAVE_DTRACE ?= 1
-# dtrace(1) probes contain dollar signs on OS X. Mute the warnings they
-# generate but only when CC=clang, -Wno-dollar-in-identifier-extension
-# is a clang extension.
-ifeq (__clang__,$(shell sh -c "$(CC) -dM -E - </dev/null | grep -ow __clang__"))
-CFLAGS += -Wno-dollar-in-identifier-extension
-endif
-CPPFLAGS += -D_DARWIN_USE_64_BIT_INODE=1
-LDFLAGS += -framework Foundation \
-           -framework CoreServices \
-           -framework ApplicationServices
-SOEXT = dylib
-OBJS += src/unix/darwin.o
-OBJS += src/unix/kqueue.o
-OBJS += src/unix/fsevents.o
-OBJS += src/unix/proctitle.o
-OBJS += src/unix/darwin-proctitle.o
-endif
-
-ifeq (linux,$(PLATFORM))
-CFLAGS += -D_GNU_SOURCE
-LDFLAGS+=-ldl -lrt
-RUNNER_CFLAGS += -D_GNU_SOURCE
-OBJS += src/unix/linux-core.o \
-        src/unix/linux-inotify.o \
-        src/unix/linux-syscalls.o \
-        src/unix/proctitle.o
-endif
-
-ifeq (android,$(PLATFORM))
-CFLAGS += -D_GNU_SOURCE
-LDFLAGS+=-ldl -lrt
-RUNNER_CFLAGS += -D_GNU_SOURCE
-OBJS += src/unix/linux-core.o \
-        src/unix/linux-inotify.o \
-        src/unix/linux-syscalls.o \
-        src/unix/proctitle.o
-else
-CFLAGS += -std=c89
-endif
-
-ifeq (freebsd,$(PLATFORM))
-ifeq ($(shell dtrace -l 1>&2 2>/dev/null; echo $$?),0)
-HAVE_DTRACE ?= 1
-endif
-LDFLAGS+=-lkvm
-OBJS += src/unix/freebsd.o
-OBJS += src/unix/kqueue.o
-endif
-
-ifeq (dragonfly,$(PLATFORM))
-LDFLAGS+=-lkvm
-OBJS += src/unix/freebsd.o
-OBJS += src/unix/kqueue.o
-endif
-
-ifeq (netbsd,$(PLATFORM))
-LDFLAGS+=-lkvm
-OBJS += src/unix/netbsd.o
-OBJS += src/unix/kqueue.o
-endif
-
-ifeq (openbsd,$(PLATFORM))
-LDFLAGS+=-lkvm
-OBJS += src/unix/openbsd.o
-OBJS += src/unix/kqueue.o
-endif
-
-ifeq (sunos,$(PLATFORM))
-RUNNER_LDFLAGS += -pthreads
-else
-ifneq (android, $(PLATFORM))
-RUNNER_LDFLAGS += -pthread
-endif
-endif
-
-ifeq ($(HAVE_DTRACE), 1)
-DTRACE_HEADER = src/unix/uv-dtrace.h
-CPPFLAGS += -Isrc/unix
-CFLAGS += -DHAVE_DTRACE
-endif
-
-ifneq (darwin,$(PLATFORM))
-# Must correspond with UV_VERSION_MAJOR and UV_VERSION_MINOR in src/version.c
-SO_LDFLAGS = -Wl,-soname,libuv.so.0.11
-endif
-
-RUNNER_LDFLAGS += $(LDFLAGS)
-
-all:
-	# Force a sequential build of the static and the shared library.
-	# Works around a make quirk where it forgets to (re)build either
-	# the *.o or *.pic.o files, depending on what target comes first.
-	$(MAKE) -f $(SRCDIR)/Makefile libuv.a
-	$(MAKE) -f $(SRCDIR)/Makefile libuv.$(SOEXT)
-
-libuv.a: $(OBJS)
-	$(AR) rcs $@ $^
-
-libuv.$(SOEXT):	override CFLAGS += -fPIC
-libuv.$(SOEXT):	$(OBJS:%.o=%.pic.o)
-	$(CC) -shared -o $@ $^ $(LDFLAGS) $(SO_LDFLAGS)
-
-include/uv-private/uv-unix.h: \
-	include/uv-private/uv-bsd.h \
-	include/uv-private/uv-darwin.h \
-	include/uv-private/uv-linux.h \
-	include/uv-private/uv-sunos.h
-
-src/unix/internal.h: src/unix/linux-syscalls.h src/uv-common.h
-src/uv-common.h: src/queue.h
-
-src/.buildstamp src/unix/.buildstamp test/.buildstamp:
-	mkdir -p $(@D)
-	touch $@
-
-src/unix/%.o src/unix/%.pic.o: src/unix/%.c include/uv.h include/uv-private/uv-unix.h src/unix/internal.h src/unix/.buildstamp $(DTRACE_HEADER)
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
-
-src/%.o src/%.pic.o: src/%.c include/uv.h include/uv-private/uv-unix.h src/.buildstamp
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
-
-test/%.o: test/%.c include/uv.h test/.buildstamp
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
-
-clean-platform:
-	$(RM) test/run-{tests,benchmarks}.dSYM $(OBJS) $(OBJS:%.o=%.pic.o) src/unix/uv-dtrace.h
-
-src/unix/uv-dtrace.h: src/unix/uv-dtrace.d
-	dtrace -h -xnolibs -s $< -o $@
-
-src/unix/dtrace.o: src/unix/uv-dtrace.d $(DTRACE_OBJS)
-	dtrace -G -s $^ -o $@
-
-src/unix/dtrace.pic.o: src/unix/uv-dtrace.d $(DTRACE_OBJS:%.o=%.pic.o)
-	dtrace -G -s $^ -o $@
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 00000000..cf0a966d
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,45 @@
+# Copyright (c) 2013, Ben Noordhuis <info@bnoordhuis.nl>
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+AC_PREREQ(2.57)
+AC_INIT([libuv], [0.11.5], [https://github.com/joyent/libuv/issues])
+AM_INIT_AUTOMAKE([foreign -Wall -Werror])
+AM_SILENT_RULES([yes])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CANONICAL_HOST
+AC_ENABLE_SHARED
+AC_ENABLE_STATIC
+AC_PROG_CC
+AM_PROG_AR
+LT_INIT
+# TODO(bnoordhuis) Check for -pthread vs. -pthreads
+AC_CHECK_LIB([dl], [dlopen])
+AC_CHECK_LIB([kstat], [kstat_lookup])
+AC_CHECK_LIB([kvm], [kvm_open])
+AC_CHECK_LIB([nsl], [gethostbyname])
+AC_CHECK_LIB([perfstat], [perfstat_cpu])
+AC_CHECK_LIB([pthread], [pthread_mutex_init])
+AC_CHECK_LIB([rt], [clock_gettime])
+AC_CHECK_LIB([sendfile], [sendfile])
+AC_CHECK_LIB([socket], [socket])
+AC_SYS_LARGEFILE
+AM_CONDITIONAL([AIX],     [AS_CASE([$host_os], [aix*],     [true], [false])])
+AM_CONDITIONAL([DARWIN],  [AS_CASE([$host_os], [darwin*],  [true], [false])])
+AM_CONDITIONAL([FREEBSD], [AS_CASE([$host_os], [freebsd*], [true], [false])])
+AM_CONDITIONAL([LINUX],   [AS_CASE([$host_os], [linux*],   [true], [false])])
+AM_CONDITIONAL([NETBSD],  [AS_CASE([$host_os], [netbsd*],  [true], [false])])
+AM_CONDITIONAL([OPENBSD], [AS_CASE([$host_os], [openbsd*], [true], [false])])
+AM_CONDITIONAL([SUNOS],   [AS_CASE([$host_os], [solaris*], [true], [false])])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/include/uv-private/pthread-fixes.h b/include/pthread-fixes.h
index 230ce317..230ce317 100644
--- a/include/uv-private/pthread-fixes.h
+++ b/include/pthread-fixes.h
diff --git a/include/uv-private/stdint-msvc2008.h b/include/stdint-msvc2008.h
index d02608a5..d02608a5 100644
--- a/include/uv-private/stdint-msvc2008.h
+++ b/include/stdint-msvc2008.h
diff --git a/include/uv-private/tree.h b/include/tree.h
index f936416e..f936416e 100644
--- a/include/uv-private/tree.h
+++ b/include/tree.h
diff --git a/include/uv-private/uv-bsd.h b/include/uv-bsd.h
index 2d72b3d7..2d72b3d7 100644
--- a/include/uv-private/uv-bsd.h
+++ b/include/uv-bsd.h
diff --git a/include/uv-private/uv-darwin.h b/include/uv-darwin.h
index 110115cd..110115cd 100644
--- a/include/uv-private/uv-darwin.h
+++ b/include/uv-darwin.h
diff --git a/include/uv-private/uv-linux.h b/include/uv-linux.h
index 9b38405a..9b38405a 100644
--- a/include/uv-private/uv-linux.h
+++ b/include/uv-linux.h
diff --git a/include/uv-private/uv-sunos.h b/include/uv-sunos.h
index 04216642..04216642 100644
--- a/include/uv-private/uv-sunos.h
+++ b/include/uv-sunos.h
diff --git a/include/uv-private/uv-unix.h b/include/uv-unix.h
index 4c05a714..4c05a714 100644
--- a/include/uv-private/uv-unix.h
+++ b/include/uv-unix.h
diff --git a/include/uv-private/uv-win.h b/include/uv-win.h
index 0ca4bc28..1c27452e 100644
--- a/include/uv-private/uv-win.h
+++ b/include/uv-win.h
@@ -39,7 +39,7 @@ typedef intptr_t ssize_t;
 #include <sys/stat.h>
 
 #if defined(_MSC_VER) && _MSC_VER < 1600
-# include "uv-private/stdint-msvc2008.h"
+# include "stdint-msvc2008.h"
 #else
 # include <stdint.h>
 #endif
diff --git a/include/uv.h b/include/uv.h
index e8a1aef3..7008775b 100644
--- a/include/uv.h
+++ b/include/uv.h
@@ -46,7 +46,7 @@ extern "C" {
 #endif
 
 #if defined(_MSC_VER) && _MSC_VER < 1600
-# include "uv-private/stdint-msvc2008.h"
+# include "stdint-msvc2008.h"
 #else
 # include <stdint.h>
 #endif
@@ -59,9 +59,9 @@ extern "C" {
 
 #if defined(__unix__) || defined(__POSIX__) || \
     defined(__APPLE__) || defined(_AIX)
-# include "uv-private/uv-unix.h"
+# include "uv-unix.h"
 #else
-# include "uv-private/uv-win.h"
+# include "uv-win.h"
 #endif
 
 /* Expand this list if necessary. */
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 00000000..bde78f43
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,2 @@
+# Ignore libtoolize-generated files.
+*.m4
diff --git a/src/inet.c b/src/inet.c
index 8f9d89b0..4319e602 100644
--- a/src/inet.c
+++ b/src/inet.c
@@ -19,7 +19,7 @@
 #include <string.h>
 
 #if defined(_MSC_VER) && _MSC_VER < 1600
-# include "uv-private/stdint-msvc2008.h"
+# include "stdint-msvc2008.h"
 #else
 # include <stdint.h>
 #endif
diff --git a/src/uv-common.h b/src/uv-common.h
index bbd3e17b..1402356e 100644
--- a/src/uv-common.h
+++ b/src/uv-common.h
@@ -31,7 +31,7 @@
 #include <stddef.h>
 
 #if defined(_MSC_VER) && _MSC_VER < 1600
-# include "uv-private/stdint-msvc2008.h"
+# include "stdint-msvc2008.h"
 #else
 # include <stdint.h>
 #endif
diff --git a/src/win/tty.c b/src/win/tty.c
index 64934ffa..f17e9577 100644
--- a/src/win/tty.c
+++ b/src/win/tty.c
@@ -24,7 +24,7 @@
 #include <string.h>
 
 #if defined(_MSC_VER) && _MSC_VER < 1600
-# include "uv-private/stdint-msvc2008.h"
+# include "stdint-msvc2008.h"
 #else
 # include <stdint.h>
 #endif
diff --git a/test/task.h b/test/task.h
index 1e3f8df8..6f96a4ff 100644
--- a/test/task.h
+++ b/test/task.h
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 
 #if defined(_MSC_VER) && _MSC_VER < 1600
-# include "uv-private/stdint-msvc2008.h"
+# include "stdint-msvc2008.h"
 #else
 # include <stdint.h>
 #endif
diff --git a/uv.gyp b/uv.gyp
index 40a81aac..12b5c353 100644
--- a/uv.gyp
+++ b/uv.gyp
@@ -35,7 +35,6 @@
       'type': '<(library)',
       'include_dirs': [
         'include',
-        'include/uv-private',
         'src/',
       ],
       'direct_dependent_settings': {
@@ -61,7 +60,7 @@
       'sources': [
         'common.gypi',
         'include/uv.h',
-        'include/uv-private/tree.h',
+        'include/tree.h',
         'src/fs-poll.c',
         'src/inet.c',
         'src/queue.h',
@@ -76,7 +75,7 @@
             '_GNU_SOURCE',
           ],
           'sources': [
-            'include/uv-private/uv-win.h',
+            'include/uv-win.h',
             'src/win/async.c',
             'src/win/atomicops-inl.h',
             'src/win/core.c',
@@ -129,11 +128,11 @@
             '-Wno-unused-parameter',
           ],
           'sources': [
-            'include/uv-private/uv-unix.h',
-            'include/uv-private/uv-linux.h',
-            'include/uv-private/uv-sunos.h',
-            'include/uv-private/uv-darwin.h',
-            'include/uv-private/uv-bsd.h',
+            'include/uv-unix.h',
+            'include/uv-linux.h',
+            'include/uv-sunos.h',
+            'include/uv-darwin.h',
+            'include/uv-bsd.h',
             'src/unix/async.c',
             'src/unix/core.c',
             'src/unix/dl.c',