diff --git a/node.gyp b/node.gyp
index 9c1478cd8d3f34..29a5aaf805d195 100644
--- a/node.gyp
+++ b/node.gyp
@@ -188,7 +188,7 @@
       ],
 
       'sources': [
-        'src/async-wrap.cc',
+        'src/async_wrap.cc',
         'src/cares_wrap.cc',
         'src/connection_wrap.cc',
         'src/connect_wrap.cc',
@@ -242,8 +242,8 @@
         'src/uv.cc',
         # headers to make for a more pleasant IDE experience
         'src/aliased_buffer.h',
-        'src/async-wrap.h',
-        'src/async-wrap-inl.h',
+        'src/async_wrap.h',
+        'src/async_wrap-inl.h',
         'src/base-object.h',
         'src/base-object-inl.h',
         'src/connection_wrap.h',
@@ -831,7 +831,7 @@
       'conditions': [
         ['node_target_type!="static_library"', {
           'libraries': [
-            '<(OBJ_PATH)<(OBJ_SEPARATOR)async-wrap.<(OBJ_SUFFIX)',
+            '<(OBJ_PATH)<(OBJ_SEPARATOR)async_wrap.<(OBJ_SUFFIX)',
             '<(OBJ_PATH)<(OBJ_SEPARATOR)env.<(OBJ_SUFFIX)',
             '<(OBJ_PATH)<(OBJ_SEPARATOR)node.<(OBJ_SUFFIX)',
             '<(OBJ_PATH)<(OBJ_SEPARATOR)node_buffer.<(OBJ_SUFFIX)',
diff --git a/src/async-wrap-inl.h b/src/async_wrap-inl.h
similarity index 98%
rename from src/async-wrap-inl.h
rename to src/async_wrap-inl.h
index 617d51dc59f037..219dfa71b6cdf0 100644
--- a/src/async-wrap-inl.h
+++ b/src/async_wrap-inl.h
@@ -24,7 +24,7 @@
 
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
-#include "async-wrap.h"
+#include "async_wrap.h"
 #include "base-object-inl.h"
 #include "node_internals.h"
 
diff --git a/src/async-wrap.cc b/src/async_wrap.cc
similarity index 99%
rename from src/async-wrap.cc
rename to src/async_wrap.cc
index ff7ad1b9819a79..ec3f68e76a1605 100644
--- a/src/async-wrap.cc
+++ b/src/async_wrap.cc
@@ -19,7 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "async-wrap-inl.h"
+#include "async_wrap-inl.h"
 #include "env-inl.h"
 #include "util-inl.h"
 
diff --git a/src/async-wrap.h b/src/async_wrap.h
similarity index 100%
rename from src/async-wrap.h
rename to src/async_wrap.h
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
index f9072f2898052a..2a3620549c5bb3 100644
--- a/src/cares_wrap.cc
+++ b/src/cares_wrap.cc
@@ -21,7 +21,7 @@
 
 #define CARES_STATICLIB
 #include "ares.h"
-#include "async-wrap-inl.h"
+#include "async_wrap-inl.h"
 #include "env-inl.h"
 #include "node.h"
 #include "req-wrap-inl.h"
diff --git a/src/connect_wrap.h b/src/connect_wrap.h
index 7b16a5448745aa..59918078960016 100644
--- a/src/connect_wrap.h
+++ b/src/connect_wrap.h
@@ -5,7 +5,7 @@
 
 #include "env.h"
 #include "req-wrap.h"
-#include "async-wrap.h"
+#include "async_wrap.h"
 #include "v8.h"
 
 namespace node {
diff --git a/src/env.cc b/src/env.cc
index af8a191f89c1a6..c177deb67d129f 100644
--- a/src/env.cc
+++ b/src/env.cc
@@ -1,5 +1,5 @@
 #include "node_internals.h"
-#include "async-wrap.h"
+#include "async_wrap.h"
 #include "v8-profiler.h"
 
 #if defined(_MSC_VER)
diff --git a/src/fs_event_wrap.cc b/src/fs_event_wrap.cc
index da39602c1bba36..cb011bcc0143b9 100644
--- a/src/fs_event_wrap.cc
+++ b/src/fs_event_wrap.cc
@@ -19,7 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "async-wrap-inl.h"
+#include "async_wrap-inl.h"
 #include "env-inl.h"
 #include "util-inl.h"
 #include "node.h"
diff --git a/src/handle_wrap.cc b/src/handle_wrap.cc
index 071f5ff873758a..7dcafa2ce6e842 100644
--- a/src/handle_wrap.cc
+++ b/src/handle_wrap.cc
@@ -20,7 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "handle_wrap.h"
-#include "async-wrap-inl.h"
+#include "async_wrap-inl.h"
 #include "env-inl.h"
 #include "util-inl.h"
 #include "node.h"
diff --git a/src/handle_wrap.h b/src/handle_wrap.h
index f8be356e1a730c..29e4f364603bda 100644
--- a/src/handle_wrap.h
+++ b/src/handle_wrap.h
@@ -24,7 +24,7 @@
 
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
-#include "async-wrap.h"
+#include "async_wrap.h"
 #include "util.h"
 #include "uv.h"
 #include "v8.h"
diff --git a/src/js_stream.cc b/src/js_stream.cc
index 9d28b90585048a..1b102451cd6d82 100644
--- a/src/js_stream.cc
+++ b/src/js_stream.cc
@@ -1,6 +1,6 @@
 #include "js_stream.h"
 
-#include "async-wrap.h"
+#include "async_wrap.h"
 #include "env-inl.h"
 #include "node_buffer.h"
 #include "stream_base-inl.h"
diff --git a/src/js_stream.h b/src/js_stream.h
index a4a67ae3372620..44bf7a06df7f8f 100644
--- a/src/js_stream.h
+++ b/src/js_stream.h
@@ -3,7 +3,7 @@
 
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
-#include "async-wrap.h"
+#include "async_wrap.h"
 #include "env.h"
 #include "stream_base.h"
 #include "v8.h"
diff --git a/src/node.cc b/src/node.cc
index 37fdd47ec176cc..a6c6017f149139 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -54,7 +54,7 @@
 #endif
 
 #include "ares.h"
-#include "async-wrap-inl.h"
+#include "async_wrap-inl.h"
 #include "env-inl.h"
 #include "handle_wrap.h"
 #include "http_parser.h"
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 95780444a9625f..4f089b940ee4b2 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -28,7 +28,7 @@
 #include "node_mutex.h"
 #include "tls_wrap.h"  // TLSWrap
 
-#include "async-wrap-inl.h"
+#include "async_wrap-inl.h"
 #include "env-inl.h"
 #include "string_bytes.h"
 #include "util-inl.h"
diff --git a/src/node_crypto.h b/src/node_crypto.h
index a9719dec257d26..4034afab6f208c 100644
--- a/src/node_crypto.h
+++ b/src/node_crypto.h
@@ -31,7 +31,7 @@
 #include "node_buffer.h"
 
 #include "env.h"
-#include "async-wrap-inl.h"
+#include "async_wrap-inl.h"
 #include "base-object-inl.h"
 
 #include "v8.h"
diff --git a/src/node_http_parser.cc b/src/node_http_parser.cc
index 972982a4260ba4..06d6a488263a3d 100644
--- a/src/node_http_parser.cc
+++ b/src/node_http_parser.cc
@@ -22,7 +22,7 @@
 #include "node.h"
 #include "node_buffer.h"
 
-#include "async-wrap-inl.h"
+#include "async_wrap-inl.h"
 #include "env-inl.h"
 #include "http_parser.h"
 #include "stream_base-inl.h"
diff --git a/src/node_stat_watcher.cc b/src/node_stat_watcher.cc
index b8a395ef8deeab..cb48c652c97b29 100644
--- a/src/node_stat_watcher.cc
+++ b/src/node_stat_watcher.cc
@@ -20,7 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "node_stat_watcher.h"
-#include "async-wrap-inl.h"
+#include "async_wrap-inl.h"
 #include "env-inl.h"
 #include "util-inl.h"
 
diff --git a/src/node_stat_watcher.h b/src/node_stat_watcher.h
index df15f339d128a2..55f4307fdbcd8c 100644
--- a/src/node_stat_watcher.h
+++ b/src/node_stat_watcher.h
@@ -25,7 +25,7 @@
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #include "node.h"
-#include "async-wrap.h"
+#include "async_wrap.h"
 #include "env.h"
 #include "uv.h"
 #include "v8.h"
diff --git a/src/node_zlib.cc b/src/node_zlib.cc
index 01f713afd728b8..975fbf0f8f5ee8 100644
--- a/src/node_zlib.cc
+++ b/src/node_zlib.cc
@@ -22,7 +22,7 @@
 #include "node.h"
 #include "node_buffer.h"
 
-#include "async-wrap-inl.h"
+#include "async_wrap-inl.h"
 #include "env-inl.h"
 #include "util-inl.h"
 
diff --git a/src/pipe_wrap.cc b/src/pipe_wrap.cc
index 5a6eeaa3ebdeb8..94510ed44bbc0a 100644
--- a/src/pipe_wrap.cc
+++ b/src/pipe_wrap.cc
@@ -21,7 +21,7 @@
 
 #include "pipe_wrap.h"
 
-#include "async-wrap.h"
+#include "async_wrap.h"
 #include "connection_wrap.h"
 #include "env-inl.h"
 #include "handle_wrap.h"
diff --git a/src/pipe_wrap.h b/src/pipe_wrap.h
index 6db7f4561cb522..6f22038b918f76 100644
--- a/src/pipe_wrap.h
+++ b/src/pipe_wrap.h
@@ -24,7 +24,7 @@
 
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
-#include "async-wrap.h"
+#include "async_wrap.h"
 #include "connection_wrap.h"
 #include "env.h"
 
diff --git a/src/req-wrap-inl.h b/src/req-wrap-inl.h
index 4cf8e425de3833..171160c2a15691 100644
--- a/src/req-wrap-inl.h
+++ b/src/req-wrap-inl.h
@@ -4,7 +4,7 @@
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #include "req-wrap.h"
-#include "async-wrap-inl.h"
+#include "async_wrap-inl.h"
 #include "env-inl.h"
 #include "util-inl.h"
 
diff --git a/src/req-wrap.h b/src/req-wrap.h
index 0fddae67460d6f..83baf9d2a35285 100644
--- a/src/req-wrap.h
+++ b/src/req-wrap.h
@@ -3,7 +3,7 @@
 
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
-#include "async-wrap.h"
+#include "async_wrap.h"
 #include "env.h"
 #include "util.h"
 #include "v8.h"
diff --git a/src/signal_wrap.cc b/src/signal_wrap.cc
index 70b831132bb735..59aa45078b3ae6 100644
--- a/src/signal_wrap.cc
+++ b/src/signal_wrap.cc
@@ -19,7 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "async-wrap-inl.h"
+#include "async_wrap-inl.h"
 #include "env-inl.h"
 #include "handle_wrap.h"
 #include "util-inl.h"
diff --git a/src/stream_base.h b/src/stream_base.h
index 20cb0155c9d7b9..94e4bfd73961da 100644
--- a/src/stream_base.h
+++ b/src/stream_base.h
@@ -4,7 +4,7 @@
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #include "env.h"
-#include "async-wrap.h"
+#include "async_wrap.h"
 #include "req-wrap-inl.h"
 #include "node.h"
 #include "util.h"
diff --git a/src/tcp_wrap.h b/src/tcp_wrap.h
index 95c0b1c1e5b99e..fa6bac01386256 100644
--- a/src/tcp_wrap.h
+++ b/src/tcp_wrap.h
@@ -24,7 +24,7 @@
 
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
-#include "async-wrap.h"
+#include "async_wrap.h"
 #include "env.h"
 #include "connection_wrap.h"
 
diff --git a/src/timer_wrap.cc b/src/timer_wrap.cc
index aabde9a6133ca2..eeaee70a02331c 100644
--- a/src/timer_wrap.cc
+++ b/src/timer_wrap.cc
@@ -19,7 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "async-wrap-inl.h"
+#include "async_wrap-inl.h"
 #include "env-inl.h"
 #include "handle_wrap.h"
 #include "util-inl.h"
diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc
index 3315267330afa2..d1cfcd9f17e81f 100644
--- a/src/tls_wrap.cc
+++ b/src/tls_wrap.cc
@@ -20,7 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "tls_wrap.h"
-#include "async-wrap-inl.h"
+#include "async_wrap-inl.h"
 #include "node_buffer.h"  // Buffer
 #include "node_crypto.h"  // SecureContext
 #include "node_crypto_bio.h"  // NodeBIO
diff --git a/src/tls_wrap.h b/src/tls_wrap.h
index 99d2dc9121f139..b782e7c3c23178 100644
--- a/src/tls_wrap.h
+++ b/src/tls_wrap.h
@@ -27,7 +27,7 @@
 #include "node.h"
 #include "node_crypto.h"  // SSLWrap
 
-#include "async-wrap.h"
+#include "async_wrap.h"
 #include "env.h"
 #include "stream_wrap.h"
 #include "util.h"
diff --git a/src/udp_wrap.h b/src/udp_wrap.h
index fe9256bcc63a05..50a7455beb6a9e 100644
--- a/src/udp_wrap.h
+++ b/src/udp_wrap.h
@@ -24,7 +24,7 @@
 
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
-#include "async-wrap.h"
+#include "async_wrap.h"
 #include "env.h"
 #include "handle_wrap.h"
 #include "req-wrap-inl.h"