Fix sanity issues, try to fix node build

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"', {

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 */

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);

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 */

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"', {