From 8cf5303e8cc2e411420b0c69070dfdb838b182f3 Mon Sep 17 00:00:00 2001
From: Adam Michalik <xyzzyz@google.com>
Date: Mon, 16 May 2016 16:08:05 -0700
Subject: [PATCH] more separation

---
 include/grpc/grpc_posix.h                     |  4 ++-
 .../client/insecure/channel_create_posix.c    | 28 ++++++++-----------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/include/grpc/grpc_posix.h b/include/grpc/grpc_posix.h
index 4eedc10ef22..12bb287d1ac 100644
--- a/include/grpc/grpc_posix.h
+++ b/include/grpc/grpc_posix.h
@@ -34,7 +34,10 @@
 #ifndef GRPC_GRPC_POSIX_H
 #define GRPC_GRPC_POSIX_H
 
+
 #include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/support/port_platform.h>
+
 #include <stddef.h>
 
 #ifdef __cplusplus
@@ -47,7 +50,6 @@ extern "C" {
  * functionality on top of GRPC Core.
  */
 
-
 #ifdef GPR_POSIX_SOCKET
 
 /** Create a client channel to 'target' using file descriptor 'fd'. The 'target'
diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.c b/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.c
index fdcf4c44306..7d28dbf8a9f 100644
--- a/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.c
+++ b/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.c
@@ -31,28 +31,22 @@
  *
  */
 
+#include <grpc/support/port_platform.h>
+
 #ifdef GPR_POSIX_SOCKET
 
 #include <grpc/grpc.h>
 
-// #include <fcntl.h>
-// #include <stdlib.h>
-// #include <string.h>
-
-// #include <grpc/support/alloc.h>
-// #include <grpc/support/slice.h>
-// #include <grpc/support/slice_buffer.h>
+#include <fcntl.h>
 
-// #include "src/core/ext/client_config/client_channel.h"
-// #include "src/core/ext/client_config/resolver_registry.h"
-// #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
-// #include "src/core/lib/channel/channel_args.h"
-// #include "src/core/lib/channel/compress_filter.h"
-// #include "src/core/lib/channel/http_client_filter.h"
-// #include "src/core/lib/iomgr/tcp_client.h"
-// #include "src/core/lib/iomgr/tcp_posix.h"
-// #include "src/core/lib/surface/api_trace.h"
-// #include "src/core/lib/surface/channel.h"
+#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
+#include "src/core/lib/channel/channel_args.h"
+#include "src/core/lib/transport/transport.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/iomgr/endpoint.h"
+#include "src/core/lib/iomgr/tcp_posix.h"
+#include "src/core/lib/surface/api_trace.h"
+#include "src/core/lib/surface/channel.h"
 
 
 grpc_channel *grpc_insecure_channel_create_from_fd(