diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 52eb4e35c92..09535f40d8b 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -736,6 +736,7 @@ tf_cc_shared_object(
     deps = [
         "//tensorflow/c/experimental/filesystem:filesystem_interface",
         "//tensorflow/c/experimental/stream_executor:stream_executor",
+        "//tensorflow/c:env",
         "//tensorflow/c:kernels",
         "//tensorflow/c:logging",
         "//tensorflow/c:ops_hdrs",
diff --git a/tensorflow/c/BUILD b/tensorflow/c/BUILD
index 294f369c57f..59a87292196 100644
--- a/tensorflow/c/BUILD
+++ b/tensorflow/c/BUILD
@@ -505,11 +505,13 @@ tf_cuda_library(
             "//tensorflow/core:framework",
         ],
     }) + [
-        ":c_api",
+        ":c_api_macros",
+        ":tf_status",
         ":tf_status_helper",
-        ":c_api_internal",
         ":tf_file_statistics",
-        "//tensorflow/core:lib",
+        "//tensorflow/core/platform:env",
+        "//tensorflow/core/platform:path",
+        "//tensorflow/core/platform:types",
     ],
 )
 
diff --git a/tensorflow/c/env.cc b/tensorflow/c/env.cc
index fbde13dea5a..0bdcada1f53 100644
--- a/tensorflow/c/env.cc
+++ b/tensorflow/c/env.cc
@@ -15,7 +15,8 @@ limitations under the License.
 
 #include "tensorflow/c/env.h"
 
-#include "tensorflow/c/c_api_internal.h"
+#include "tensorflow/c/c_api_macros.h"
+#include "tensorflow/c/tf_status.h"
 #include "tensorflow/c/tf_status_helper.h"
 #include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/path.h"
diff --git a/tensorflow/c/env.h b/tensorflow/c/env.h
index 63e2c86ad44..ac6a9e32aff 100644
--- a/tensorflow/c/env.h
+++ b/tensorflow/c/env.h
@@ -20,8 +20,9 @@ limitations under the License.
 #include <stddef.h>
 #include <stdint.h>
 
-#include "tensorflow/c/c_api.h"
+#include "tensorflow/c/c_api_macros.h"
 #include "tensorflow/c/tf_file_statistics.h"
+#include "tensorflow/c/tf_status.h"
 
 // --------------------------------------------------------------------------
 // C API for tensorflow::Env.