diff --git a/wpiutil/src/main/native/libuv/fs-poll.c b/wpiutil/src/main/native/libuv/fs-poll.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/fs-poll.c
rename to wpiutil/src/main/native/libuv/fs-poll.cpp
diff --git a/wpiutil/src/main/native/libuv/inet.c b/wpiutil/src/main/native/libuv/inet.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/inet.c
rename to wpiutil/src/main/native/libuv/inet.cpp
diff --git a/wpiutil/src/main/native/libuv/threadpool.c b/wpiutil/src/main/native/libuv/threadpool.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/threadpool.c
rename to wpiutil/src/main/native/libuv/threadpool.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/android-ifaddrs.c b/wpiutil/src/main/native/libuv/unix/android-ifaddrs.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/android-ifaddrs.c
rename to wpiutil/src/main/native/libuv/unix/android-ifaddrs.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/async.c b/wpiutil/src/main/native/libuv/unix/async.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/async.c
rename to wpiutil/src/main/native/libuv/unix/async.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/bsd-ifaddrs.c b/wpiutil/src/main/native/libuv/unix/bsd-ifaddrs.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/bsd-ifaddrs.c
rename to wpiutil/src/main/native/libuv/unix/bsd-ifaddrs.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/core.c b/wpiutil/src/main/native/libuv/unix/core.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/core.c
rename to wpiutil/src/main/native/libuv/unix/core.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/cygwin.c b/wpiutil/src/main/native/libuv/unix/cygwin.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/cygwin.c
rename to wpiutil/src/main/native/libuv/unix/cygwin.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/darwin-proctitle.c b/wpiutil/src/main/native/libuv/unix/darwin-proctitle.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/darwin-proctitle.c
rename to wpiutil/src/main/native/libuv/unix/darwin-proctitle.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/darwin.c b/wpiutil/src/main/native/libuv/unix/darwin.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/darwin.c
rename to wpiutil/src/main/native/libuv/unix/darwin.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/dl.c b/wpiutil/src/main/native/libuv/unix/dl.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/dl.c
rename to wpiutil/src/main/native/libuv/unix/dl.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/freebsd.c b/wpiutil/src/main/native/libuv/unix/freebsd.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/freebsd.c
rename to wpiutil/src/main/native/libuv/unix/freebsd.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/fs.c b/wpiutil/src/main/native/libuv/unix/fs.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/fs.c
rename to wpiutil/src/main/native/libuv/unix/fs.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/fsevents.c b/wpiutil/src/main/native/libuv/unix/fsevents.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/fsevents.c
rename to wpiutil/src/main/native/libuv/unix/fsevents.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/getaddrinfo.c b/wpiutil/src/main/native/libuv/unix/getaddrinfo.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/getaddrinfo.c
rename to wpiutil/src/main/native/libuv/unix/getaddrinfo.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/getnameinfo.c b/wpiutil/src/main/native/libuv/unix/getnameinfo.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/getnameinfo.c
rename to wpiutil/src/main/native/libuv/unix/getnameinfo.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/ibmi.c b/wpiutil/src/main/native/libuv/unix/ibmi.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/ibmi.c
rename to wpiutil/src/main/native/libuv/unix/ibmi.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/kqueue.c b/wpiutil/src/main/native/libuv/unix/kqueue.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/kqueue.c
rename to wpiutil/src/main/native/libuv/unix/kqueue.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/linux-core.c b/wpiutil/src/main/native/libuv/unix/linux-core.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/linux-core.c
rename to wpiutil/src/main/native/libuv/unix/linux-core.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/linux-inotify.c b/wpiutil/src/main/native/libuv/unix/linux-inotify.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/linux-inotify.c
rename to wpiutil/src/main/native/libuv/unix/linux-inotify.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/linux-syscalls.c b/wpiutil/src/main/native/libuv/unix/linux-syscalls.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/linux-syscalls.c
rename to wpiutil/src/main/native/libuv/unix/linux-syscalls.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/loop-watcher.c b/wpiutil/src/main/native/libuv/unix/loop-watcher.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/loop-watcher.c
rename to wpiutil/src/main/native/libuv/unix/loop-watcher.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/loop.c b/wpiutil/src/main/native/libuv/unix/loop.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/loop.c
rename to wpiutil/src/main/native/libuv/unix/loop.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/netbsd.c b/wpiutil/src/main/native/libuv/unix/netbsd.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/netbsd.c
rename to wpiutil/src/main/native/libuv/unix/netbsd.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/no-fsevents.c b/wpiutil/src/main/native/libuv/unix/no-fsevents.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/no-fsevents.c
rename to wpiutil/src/main/native/libuv/unix/no-fsevents.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/no-proctitle.c b/wpiutil/src/main/native/libuv/unix/no-proctitle.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/no-proctitle.c
rename to wpiutil/src/main/native/libuv/unix/no-proctitle.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/openbsd.c b/wpiutil/src/main/native/libuv/unix/openbsd.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/openbsd.c
rename to wpiutil/src/main/native/libuv/unix/openbsd.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/pipe.c b/wpiutil/src/main/native/libuv/unix/pipe.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/pipe.c
rename to wpiutil/src/main/native/libuv/unix/pipe.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/poll.c b/wpiutil/src/main/native/libuv/unix/poll.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/poll.c
rename to wpiutil/src/main/native/libuv/unix/poll.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/posix-hrtime.c b/wpiutil/src/main/native/libuv/unix/posix-hrtime.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/posix-hrtime.c
rename to wpiutil/src/main/native/libuv/unix/posix-hrtime.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/posix-poll.c b/wpiutil/src/main/native/libuv/unix/posix-poll.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/posix-poll.c
rename to wpiutil/src/main/native/libuv/unix/posix-poll.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/process.c b/wpiutil/src/main/native/libuv/unix/process.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/process.c
rename to wpiutil/src/main/native/libuv/unix/process.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/procfs-exepath.c b/wpiutil/src/main/native/libuv/unix/procfs-exepath.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/procfs-exepath.c
rename to wpiutil/src/main/native/libuv/unix/procfs-exepath.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/proctitle.c b/wpiutil/src/main/native/libuv/unix/proctitle.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/proctitle.c
rename to wpiutil/src/main/native/libuv/unix/proctitle.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/pthread-fixes.c b/wpiutil/src/main/native/libuv/unix/pthread-fixes.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/pthread-fixes.c
rename to wpiutil/src/main/native/libuv/unix/pthread-fixes.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/signal.c b/wpiutil/src/main/native/libuv/unix/signal.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/signal.c
rename to wpiutil/src/main/native/libuv/unix/signal.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/stream.c b/wpiutil/src/main/native/libuv/unix/stream.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/stream.c
rename to wpiutil/src/main/native/libuv/unix/stream.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/sysinfo-loadavg.c b/wpiutil/src/main/native/libuv/unix/sysinfo-loadavg.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/sysinfo-loadavg.c
rename to wpiutil/src/main/native/libuv/unix/sysinfo-loadavg.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/sysinfo-memory.c b/wpiutil/src/main/native/libuv/unix/sysinfo-memory.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/sysinfo-memory.c
rename to wpiutil/src/main/native/libuv/unix/sysinfo-memory.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/tcp.c b/wpiutil/src/main/native/libuv/unix/tcp.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/tcp.c
rename to wpiutil/src/main/native/libuv/unix/tcp.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/thread.c b/wpiutil/src/main/native/libuv/unix/thread.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/thread.c
rename to wpiutil/src/main/native/libuv/unix/thread.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/timer.c b/wpiutil/src/main/native/libuv/unix/timer.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/timer.c
rename to wpiutil/src/main/native/libuv/unix/timer.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/tty.c b/wpiutil/src/main/native/libuv/unix/tty.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/tty.c
rename to wpiutil/src/main/native/libuv/unix/tty.cpp
diff --git a/wpiutil/src/main/native/libuv/unix/udp.c b/wpiutil/src/main/native/libuv/unix/udp.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/unix/udp.c
rename to wpiutil/src/main/native/libuv/unix/udp.cpp
diff --git a/wpiutil/src/main/native/libuv/uv-common.c b/wpiutil/src/main/native/libuv/uv-common.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/uv-common.c
rename to wpiutil/src/main/native/libuv/uv-common.cpp
diff --git a/wpiutil/src/main/native/libuv/uv-data-getter-setters.c b/wpiutil/src/main/native/libuv/uv-data-getter-setters.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/uv-data-getter-setters.c
rename to wpiutil/src/main/native/libuv/uv-data-getter-setters.cpp
diff --git a/wpiutil/src/main/native/libuv/version.c b/wpiutil/src/main/native/libuv/version.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/version.c
rename to wpiutil/src/main/native/libuv/version.cpp
diff --git a/wpiutil/src/main/native/libuv/win/async.c b/wpiutil/src/main/native/libuv/win/async.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/async.c
rename to wpiutil/src/main/native/libuv/win/async.cpp
diff --git a/wpiutil/src/main/native/libuv/win/core.c b/wpiutil/src/main/native/libuv/win/core.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/core.c
rename to wpiutil/src/main/native/libuv/win/core.cpp
diff --git a/wpiutil/src/main/native/libuv/win/detect-wakeup.c b/wpiutil/src/main/native/libuv/win/detect-wakeup.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/detect-wakeup.c
rename to wpiutil/src/main/native/libuv/win/detect-wakeup.cpp
diff --git a/wpiutil/src/main/native/libuv/win/dl.c b/wpiutil/src/main/native/libuv/win/dl.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/dl.c
rename to wpiutil/src/main/native/libuv/win/dl.cpp
diff --git a/wpiutil/src/main/native/libuv/win/error.c b/wpiutil/src/main/native/libuv/win/error.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/error.c
rename to wpiutil/src/main/native/libuv/win/error.cpp
diff --git a/wpiutil/src/main/native/libuv/win/fs-event.c b/wpiutil/src/main/native/libuv/win/fs-event.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/fs-event.c
rename to wpiutil/src/main/native/libuv/win/fs-event.cpp
diff --git a/wpiutil/src/main/native/libuv/win/fs.c b/wpiutil/src/main/native/libuv/win/fs.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/fs.c
rename to wpiutil/src/main/native/libuv/win/fs.cpp
diff --git a/wpiutil/src/main/native/libuv/win/getaddrinfo.c b/wpiutil/src/main/native/libuv/win/getaddrinfo.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/getaddrinfo.c
rename to wpiutil/src/main/native/libuv/win/getaddrinfo.cpp
diff --git a/wpiutil/src/main/native/libuv/win/getnameinfo.c b/wpiutil/src/main/native/libuv/win/getnameinfo.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/getnameinfo.c
rename to wpiutil/src/main/native/libuv/win/getnameinfo.cpp
diff --git a/wpiutil/src/main/native/libuv/win/handle.c b/wpiutil/src/main/native/libuv/win/handle.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/handle.c
rename to wpiutil/src/main/native/libuv/win/handle.cpp
diff --git a/wpiutil/src/main/native/libuv/win/loop-watcher.c b/wpiutil/src/main/native/libuv/win/loop-watcher.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/loop-watcher.c
rename to wpiutil/src/main/native/libuv/win/loop-watcher.cpp
diff --git a/wpiutil/src/main/native/libuv/win/pipe.c b/wpiutil/src/main/native/libuv/win/pipe.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/pipe.c
rename to wpiutil/src/main/native/libuv/win/pipe.cpp
diff --git a/wpiutil/src/main/native/libuv/win/poll.c b/wpiutil/src/main/native/libuv/win/poll.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/poll.c
rename to wpiutil/src/main/native/libuv/win/poll.cpp
diff --git a/wpiutil/src/main/native/libuv/win/process-stdio.c b/wpiutil/src/main/native/libuv/win/process-stdio.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/process-stdio.c
rename to wpiutil/src/main/native/libuv/win/process-stdio.cpp
diff --git a/wpiutil/src/main/native/libuv/win/process.c b/wpiutil/src/main/native/libuv/win/process.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/process.c
rename to wpiutil/src/main/native/libuv/win/process.cpp
diff --git a/wpiutil/src/main/native/libuv/win/req.c b/wpiutil/src/main/native/libuv/win/req.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/req.c
rename to wpiutil/src/main/native/libuv/win/req.cpp
diff --git a/wpiutil/src/main/native/libuv/win/signal.c b/wpiutil/src/main/native/libuv/win/signal.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/signal.c
rename to wpiutil/src/main/native/libuv/win/signal.cpp
diff --git a/wpiutil/src/main/native/libuv/win/snprintf.c b/wpiutil/src/main/native/libuv/win/snprintf.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/snprintf.c
rename to wpiutil/src/main/native/libuv/win/snprintf.cpp
diff --git a/wpiutil/src/main/native/libuv/win/stream.c b/wpiutil/src/main/native/libuv/win/stream.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/stream.c
rename to wpiutil/src/main/native/libuv/win/stream.cpp
diff --git a/wpiutil/src/main/native/libuv/win/tcp.c b/wpiutil/src/main/native/libuv/win/tcp.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/tcp.c
rename to wpiutil/src/main/native/libuv/win/tcp.cpp
diff --git a/wpiutil/src/main/native/libuv/win/thread.c b/wpiutil/src/main/native/libuv/win/thread.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/thread.c
rename to wpiutil/src/main/native/libuv/win/thread.cpp
diff --git a/wpiutil/src/main/native/libuv/win/timer.c b/wpiutil/src/main/native/libuv/win/timer.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/timer.c
rename to wpiutil/src/main/native/libuv/win/timer.cpp
diff --git a/wpiutil/src/main/native/libuv/win/tty.c b/wpiutil/src/main/native/libuv/win/tty.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/tty.c
rename to wpiutil/src/main/native/libuv/win/tty.cpp
diff --git a/wpiutil/src/main/native/libuv/win/udp.c b/wpiutil/src/main/native/libuv/win/udp.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/udp.c
rename to wpiutil/src/main/native/libuv/win/udp.cpp
diff --git a/wpiutil/src/main/native/libuv/win/util.c b/wpiutil/src/main/native/libuv/win/util.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/util.c
rename to wpiutil/src/main/native/libuv/win/util.cpp
diff --git a/wpiutil/src/main/native/libuv/win/winapi.c b/wpiutil/src/main/native/libuv/win/winapi.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/winapi.c
rename to wpiutil/src/main/native/libuv/win/winapi.cpp
diff --git a/wpiutil/src/main/native/libuv/win/winsock.c b/wpiutil/src/main/native/libuv/win/winsock.cpp
similarity index 100%
rename from wpiutil/src/main/native/libuv/win/winsock.c
rename to wpiutil/src/main/native/libuv/win/winsock.cpp