diff --git a/binding.gyp b/binding.gyp
index a4ddd6166862582aaa15fe228ced6f8f9b1c342c..e522e6d16bd1e51e793734c79ced5995f65df5e2 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -46,7 +46,8 @@
       ['OS == "win"', {
         "include_dirs": [
           "third_party/boringssl/include",
-          "third_party/zlib"
+          "third_party/zlib",
+          "third_party/c-ares"
         ],
         "defines": [
           '_WIN32_WINNT=0x0600',
@@ -84,7 +85,8 @@
         ],
         'include_dirs': [
           '<(node_root_dir)/deps/openssl/openssl/include',
-          '<(node_root_dir)/deps/zlib'
+          '<(node_root_dir)/deps/zlib',
+          '<(node_root_dir)/deps/cares/include'
         ],
         'conditions': [
           ['config=="gcov"', {
diff --git a/src/core/ext/resolver/dns/c_ares/grpc_ares_ev_driver.h b/src/core/ext/resolver/dns/c_ares/grpc_ares_ev_driver.h
index f94fa88af199be1d55fa54e7cb571c8ec8745fc4..e874853319004ff2a3c77b6a5697e5b8e304c735 100644
--- a/src/core/ext/resolver/dns/c_ares/grpc_ares_ev_driver.h
+++ b/src/core/ext/resolver/dns/c_ares/grpc_ares_ev_driver.h
@@ -31,6 +31,9 @@
  *
  */
 
+#ifndef GRPC_CORE_EXT_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H
+#define GRPC_CORE_EXT_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H
+
 #include <ares.h>
 
 #include "src/core/lib/iomgr/exec_ctx.h"
@@ -46,3 +49,5 @@ void grpc_ares_gethostbyname(grpc_ares_ev_driver *ev_driver, const char *host,
 grpc_error *grpc_ares_ev_driver_create(grpc_ares_ev_driver **ev_driver,
                                        grpc_pollset_set *pollset_set);
 void grpc_ares_ev_driver_destroy(grpc_ares_ev_driver *ev_driver);
+
+#endif /* GRPC_CORE_EXT_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H */
diff --git a/src/core/ext/resolver/dns/c_ares/grpc_ares_wrapper.c b/src/core/ext/resolver/dns/c_ares/grpc_ares_wrapper.c
index 73ef9f81919406b214331ef8ff65094134843d6a..224f0957dbdbd36dd05d7c25305116597c83c429 100644
--- a/src/core/ext/resolver/dns/c_ares/grpc_ares_wrapper.c
+++ b/src/core/ext/resolver/dns/c_ares/grpc_ares_wrapper.c
@@ -80,9 +80,7 @@ struct grpc_ares_request {
   grpc_ares_ev_driver *ev_driver;
 };
 
-static void do_basic_init(void) {
-  gpr_mu_init(&g_init_mu);
-}
+static void do_basic_init(void) { gpr_mu_init(&g_init_mu); }
 
 static void destroy_request(grpc_ares_request *request) {
   grpc_ares_ev_driver_destroy(request->ev_driver);
diff --git a/src/core/ext/resolver/dns/c_ares/grpc_ares_wrapper.h b/src/core/ext/resolver/dns/c_ares/grpc_ares_wrapper.h
index b6e7a169bbdf8034bba099cd19b392ab21077f6a..5ff324e2b969abd548e079ab43a799a60b3ec648 100644
--- a/src/core/ext/resolver/dns/c_ares/grpc_ares_wrapper.h
+++ b/src/core/ext/resolver/dns/c_ares/grpc_ares_wrapper.h
@@ -31,8 +31,8 @@
  *
  */
 
-#ifndef GRPC_CORE_EXT_RESOLVER_DNS_CARES_RESOLVE_ADDRESS_CARES_H
-#define GRPC_CORE_EXT_RESOLVER_DNS_CARES_RESOLVE_ADDRESS_CARES_H
+#ifndef GRPC_CORE_EXT_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H
+#define GRPC_CORE_EXT_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H
 
 #include <stddef.h>
 #include "src/core/lib/iomgr/exec_ctx.h"
@@ -51,4 +51,4 @@ grpc_error *grpc_ares_init(void);
 
 void grpc_ares_cleanup(void);
 
-#endif /* GRPC_CORE_EXT_RESOLVER_DNS_CARES_RESOLVE_ADDRESS_CARES_H */
+#endif /* GRPC_CORE_EXT_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H */
diff --git a/templates/binding.gyp.template b/templates/binding.gyp.template
index 40d430f79255673ff30f9f05b3a8edd9a7324904..6b9f44c56fc4b821daf0d7edc946662c1b8ead4a 100644
--- a/templates/binding.gyp.template
+++ b/templates/binding.gyp.template
@@ -48,7 +48,8 @@
         ['OS == "win"', {
           "include_dirs": [
             "third_party/boringssl/include",
-            "third_party/zlib"
+            "third_party/zlib",
+            "third_party/c-ares"
           ],
           "defines": [
             '_WIN32_WINNT=0x0600',
@@ -86,7 +87,8 @@
           ],
           'include_dirs': [
             '<(node_root_dir)/deps/openssl/openssl/include',
-            '<(node_root_dir)/deps/zlib'
+            '<(node_root_dir)/deps/zlib',
+            '<(node_root_dir)/deps/cares/include'
           ],
           'conditions': [
             ['config=="gcov"', {