diff --git a/Makefile b/Makefile
index 03e0058..77935bc 100644
--- a/Makefile
+++ b/Makefile
@@ -1406,7 +1406,9 @@
     src/core/iomgr/tcp_server_posix.c \
     src/core/iomgr/time_averaged_stats.c \
     src/core/json/json.c \
-    src/core/json/json-string.c \
+    src/core/json/json_reader.c \
+    src/core/json/json_string.c \
+    src/core/json/json_writer.c \
     src/core/statistics/census_init.c \
     src/core/statistics/census_log.c \
     src/core/statistics/census_rpc_stats.c \
@@ -1526,7 +1528,9 @@
 src/core/iomgr/tcp_server_posix.c: $(OPENSSL_DEP)
 src/core/iomgr/time_averaged_stats.c: $(OPENSSL_DEP)
 src/core/json/json.c: $(OPENSSL_DEP)
-src/core/json/json-string.c: $(OPENSSL_DEP)
+src/core/json/json_reader.c: $(OPENSSL_DEP)
+src/core/json/json_string.c: $(OPENSSL_DEP)
+src/core/json/json_writer.c: $(OPENSSL_DEP)
 src/core/statistics/census_init.c: $(OPENSSL_DEP)
 src/core/statistics/census_log.c: $(OPENSSL_DEP)
 src/core/statistics/census_rpc_stats.c: $(OPENSSL_DEP)
@@ -1667,7 +1671,9 @@
 objs/$(CONFIG)/src/core/iomgr/tcp_server_posix.o: 
 objs/$(CONFIG)/src/core/iomgr/time_averaged_stats.o: 
 objs/$(CONFIG)/src/core/json/json.o: 
-objs/$(CONFIG)/src/core/json/json-string.o: 
+objs/$(CONFIG)/src/core/json/json_reader.o: 
+objs/$(CONFIG)/src/core/json/json_string.o: 
+objs/$(CONFIG)/src/core/json/json_writer.o: 
 objs/$(CONFIG)/src/core/statistics/census_init.o: 
 objs/$(CONFIG)/src/core/statistics/census_log.o: 
 objs/$(CONFIG)/src/core/statistics/census_rpc_stats.o: 
@@ -1828,7 +1834,9 @@
     src/core/iomgr/tcp_server_posix.c \
     src/core/iomgr/time_averaged_stats.c \
     src/core/json/json.c \
-    src/core/json/json-string.c \
+    src/core/json/json_reader.c \
+    src/core/json/json_string.c \
+    src/core/json/json_writer.c \
     src/core/statistics/census_init.c \
     src/core/statistics/census_log.c \
     src/core/statistics/census_rpc_stats.c \
@@ -1952,7 +1960,9 @@
 objs/$(CONFIG)/src/core/iomgr/tcp_server_posix.o: 
 objs/$(CONFIG)/src/core/iomgr/time_averaged_stats.o: 
 objs/$(CONFIG)/src/core/json/json.o: 
-objs/$(CONFIG)/src/core/json/json-string.o: 
+objs/$(CONFIG)/src/core/json/json_reader.o: 
+objs/$(CONFIG)/src/core/json/json_string.o: 
+objs/$(CONFIG)/src/core/json/json_writer.o: 
 objs/$(CONFIG)/src/core/statistics/census_init.o: 
 objs/$(CONFIG)/src/core/statistics/census_log.o: 
 objs/$(CONFIG)/src/core/statistics/census_rpc_stats.o: