diff --git a/bundle.json b/bundle.json
index 03ac095e1223b244d5beb1691e7accf470c45bcc..e5722ec5196761644ca71d69c7d1309ddc2b2d3d 100644
--- a/bundle.json
+++ b/bundle.json
@@ -36,6 +36,13 @@
                     "header_files": [],
                     "header_base": "//third_party/libuv/include"
                   }
+                },
+                {
+                  "name": "//third_party/libuv:uv_static",
+                  "header": {
+                    "header_files": [],
+                    "header_base": "//third_party/libuv/include"
+                  }
                 }
             ],
             "test": []
diff --git a/src/win/internal.h b/src/win/internal.h
index c02db843b91ad9794c6054ff24702f07e411e0d8..e5626cda36ee1d049c80cf899df0c76b2dffdef1 100644
--- a/src/win/internal.h
+++ b/src/win/internal.h
@@ -23,7 +23,7 @@
 #define UV_WIN_INTERNAL_H_
 
 #include "uv.h"
-#include "../uv-common.h"
+#include "uv-common.h"
 
 #include "uv/tree.h"
 #include "winapi.h"
diff --git a/test/test-fs-fd-hash.c b/test/test-fs-fd-hash.c
index 8b4bc0351b334e0a71b5eb0fc02cfcbeafd321b0..8921ac3fa720c2ec524213ebdd37344ad36de62e 100644
--- a/test/test-fs-fd-hash.c
+++ b/test/test-fs-fd-hash.c
@@ -24,7 +24,7 @@
 #include "uv.h"
 #include "task.h"
 
-#include "../src/win/fs-fd-hash-inl.h"
+#include "fs-fd-hash-inl.h"
 
 
 #define HASH_MAX 1000000000
diff --git a/test/test-idna.c b/test/test-idna.c
index 77af3a9da0341c53c05a06920dd909324c00d8d9..08094f7f14148b6dc76e19ce2609640a24ba30a7 100644
--- a/test/test-idna.c
+++ b/test/test-idna.c
@@ -20,7 +20,7 @@
  */
 
 #include "task.h"
-#include "../src/idna.h"
+#include "idna.h"
 #include <string.h>
 
 TEST_IMPL(utf8_decode1) {
diff --git a/test/test-strscpy.c b/test/test-strscpy.c
index 993f7a13be78bb2f75fb741118d821b245c3ecf1..146e46378a5531fcb9e6de693b718f2782fd244b 100644
--- a/test/test-strscpy.c
+++ b/test/test-strscpy.c
@@ -23,7 +23,7 @@
 #include "task.h"
 #include <string.h>
 
-#include "../src/strscpy.h"
+#include "strscpy.h"
 
 TEST_IMPL(strscpy) {
   char d[4];
diff --git a/test/test-strtok.c b/test/test-strtok.c
index 507e6db66c9093e8863b0a34c47ac091038d004f..24a982636a104f6a594a29c138fdd9ce58ea7c07 100644
--- a/test/test-strtok.c
+++ b/test/test-strtok.c
@@ -23,8 +23,8 @@
 #include "task.h"
 #include <string.h>
 
-#include "../src/strtok.h"
-#include "../src/strtok.c"
+#include "strtok.h"
+#include "strtok.c"
 
 struct strtok_test_case {
   const char* str;