From b11b34a71e4aec3b8738e2600c1da4bed4c939d9 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 1 Apr 2016 12:30:06 -0700
Subject: [PATCH] Zookeeper fixes

---
 BUILD                                                | 2 +-
 Makefile                                             | 2 +-
 build.yaml                                           | 2 +-
 src/core/ext/resolver/zookeeper/zookeeper_resolver.c | 2 --
 tools/run_tests/sources_and_headers.json             | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/BUILD b/BUILD
index cdf6ddfa3ff..d53d4442c2d 100644
--- a/BUILD
+++ b/BUILD
@@ -819,7 +819,7 @@ cc_library(
 cc_library(
   name = "grpc_zookeeper",
   srcs = [
-    "src/core/ext/resolver/zookeeper_resolver.c",
+    "src/core/ext/resolver/zookeeper/zookeeper_resolver.c",
   ],
   hdrs = [
     "include/grpc/grpc_zookeeper.h",
diff --git a/Makefile b/Makefile
index 5c56fbd8930..eaf39cb3402 100644
--- a/Makefile
+++ b/Makefile
@@ -3012,7 +3012,7 @@ endif
 
 
 LIBGRPC_ZOOKEEPER_SRC = \
-    src/core/ext/resolver/zookeeper_resolver.c \
+    src/core/ext/resolver/zookeeper/zookeeper_resolver.c \
 
 PUBLIC_HEADERS_C += \
     include/grpc/grpc_zookeeper.h \
diff --git a/build.yaml b/build.yaml
index c74abcc200b..a0ebe41247b 100644
--- a/build.yaml
+++ b/build.yaml
@@ -766,7 +766,7 @@ libs:
   public_headers:
   - include/grpc/grpc_zookeeper.h
   src:
-  - src/core/ext/resolver/zookeeper_resolver.c
+  - src/core/ext/resolver/zookeeper/zookeeper_resolver.c
   deps:
   - gpr
   - grpc
diff --git a/src/core/ext/resolver/zookeeper/zookeeper_resolver.c b/src/core/ext/resolver/zookeeper/zookeeper_resolver.c
index a66c9925f05..8a600a80725 100644
--- a/src/core/ext/resolver/zookeeper/zookeeper_resolver.c
+++ b/src/core/ext/resolver/zookeeper/zookeeper_resolver.c
@@ -31,8 +31,6 @@
  *
  */
 
-#include "src/core/lib/client_config/resolvers/zookeeper_resolver.h"
-
 #include <string.h>
 
 #include <grpc/support/alloc.h>
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index ef5b500ed87..afb4c328175 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -5153,7 +5153,7 @@
     "name": "grpc_zookeeper", 
     "src": [
       "include/grpc/grpc_zookeeper.h", 
-      "src/core/ext/resolver/zookeeper_resolver.c"
+      "src/core/ext/resolver/zookeeper/zookeeper_resolver.c"
     ], 
     "third_party": false, 
     "type": "lib"