@@ -, +, @@ 
---
 .../core/platform/cloud/gcs_file_system.cc    |  2 +-
 .../platform/cloud/google_auth_provider.cc    |  2 +-
 tensorflow/core/platform/cloud/oauth_client.h |  2 +-
 .../profiler/convert/trace_events_to_json.cc  |  2 +-
 .../convert/trace_events_to_json_test.cc      |  2 +-
 .../core/profiler/internal/tfprof_timeline.h  |  2 +-
 third_party/jsoncpp.BUILD                     |  2 ++
 third_party/systemlibs/jsoncpp.BUILD          | 27 -------------------
 8 files changed, 8 insertions(+), 33 deletions(-)
--- a/tensorflow/core/platform/cloud/gcs_file_system.cc	
+++ a/tensorflow/core/platform/cloud/gcs_file_system.cc	
@@ -26,7 +26,7 @@ limitations under the License.
 #include <io.h>  // for _mktemp
 #endif
 #include "absl/base/macros.h"
-#include "include/json/json.h"
+#include "jsoncpp/json/json.h"
 #include "tensorflow/core/lib/gtl/map_util.h"
 #include "tensorflow/core/platform/cloud/curl_http_request.h"
 #include "tensorflow/core/platform/cloud/file_block_cache.h"
--- a/tensorflow/core/platform/cloud/google_auth_provider.cc	
+++ a/tensorflow/core/platform/cloud/google_auth_provider.cc	
@@ -24,7 +24,7 @@ limitations under the License.
 #include <utility>
 
 #include "absl/strings/match.h"
-#include "include/json/json.h"
+#include "jsoncpp/json/json.h"
 #include "tensorflow/core/platform/base64.h"
 #include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/errors.h"
--- a/tensorflow/core/platform/cloud/oauth_client.h	
+++ a/tensorflow/core/platform/cloud/oauth_client.h	
@@ -18,7 +18,7 @@ limitations under the License.
 
 #include <memory>
 
-#include "include/json/json.h"
+#include "jsoncpp/json/json.h"
 #include "tensorflow/core/platform/cloud/http_request.h"
 #include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/status.h"
--- a/tensorflow/core/profiler/convert/trace_events_to_json.cc	
+++ a/tensorflow/core/profiler/convert/trace_events_to_json.cc	
@@ -17,7 +17,7 @@ limitations under the License.
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-#include "include/json/json.h"
+#include "jsoncpp/json/json.h"
 #include "tensorflow/core/protobuf/trace_events.pb.h"
 
 namespace tensorflow {
--- a/tensorflow/core/profiler/convert/trace_events_to_json_test.cc	
+++ a/tensorflow/core/profiler/convert/trace_events_to_json_test.cc	
@@ -15,7 +15,7 @@ limitations under the License.
 
 #include "tensorflow/core/profiler/convert/trace_events_to_json.h"
 
-#include "include/json/json.h"
+#include "jsoncpp/json/json.h"
 #include "tensorflow/core/platform/protobuf.h"
 #include "tensorflow/core/platform/test.h"
 #include "tensorflow/core/protobuf/trace_events.pb.h"
--- a/tensorflow/core/profiler/internal/tfprof_timeline.h	
+++ a/tensorflow/core/profiler/internal/tfprof_timeline.h	
@@ -17,7 +17,7 @@ limitations under the License.
 #define TENSORFLOW_CORE_PROFILER_INTERNAL_TFPROF_TIMELINE_H_
 
 #include "absl/strings/str_cat.h"
-#include "include/json/json.h"
+#include "jsoncpp/json/json.h"
 #include "tensorflow/core/framework/graph.pb.h"
 #include "tensorflow/core/framework/step_stats.pb.h"
 #include "tensorflow/core/profiler/internal/tfprof_node_show.h"
--- a/third_party/jsoncpp.BUILD	
+++ a/third_party/jsoncpp.BUILD	
@@ -26,7 +26,9 @@ cc_library(
         "-DJSON_USE_EXCEPTION=0",
         "-DJSON_HAS_INT64",
     ],
+    include_prefix = "jsoncpp",
     includes = ["include"],
+    strip_include_prefix = "include",
     visibility = ["//visibility:public"],
     deps = [":private"],
 )
--- a/third_party/systemlibs/jsoncpp.BUILD	
+++ a/third_party/systemlibs/jsoncpp.BUILD	
@@ -5,35 +5,8 @@ filegroup(
     visibility = ["//visibility:public"],
 )
 
-HEADERS = [
-    "include/json/allocator.h",
-    "include/json/assertions.h",
-    "include/json/autolink.h",
-    "include/json/config.h",
-    "include/json/features.h",
-    "include/json/forwards.h",
-    "include/json/json.h",
-    "include/json/reader.h",
-    "include/json/value.h",
-    "include/json/version.h",
-    "include/json/writer.h",
-]
-
-genrule(
-    name = "link_headers",
-    outs = HEADERS,
-    cmd = """
-      for i in $(OUTS); do
-        i=$${i##*/}
-        ln -sf $(INCLUDEDIR)/jsoncpp/json/$$i $(@D)/include/json/$$i
-      done
-    """,
-)
-
 cc_library(
     name = "jsoncpp",
-    hdrs = HEADERS,
-    includes = ["."],
     linkopts = ["-ljsoncpp"],
     visibility = ["//visibility:public"],
 )
--