diff --git a/build.yaml b/build.yaml
index 4fc7a85712a..8d610bae74e 100644
--- a/build.yaml
+++ b/build.yaml
@@ -735,20 +735,20 @@ filegroups:
   - test/core/util/trickle_endpoint.h
   src:
   - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
-  - test/core/end2end/cq_verifier.cc
-  - test/core/end2end/fixtures/http_proxy_fixture.cc
-  - test/core/end2end/fixtures/proxy.cc
-  - test/core/iomgr/endpoint_tests.cc
-  - test/core/util/debugger_macros.cc
-  - test/core/util/grpc_profiler.cc
-  - test/core/util/memory_counters.cc
-  - test/core/util/mock_endpoint.cc
-  - test/core/util/parse_hexstring.cc
-  - test/core/util/passthru_endpoint.cc
-  - test/core/util/port.cc
-  - test/core/util/port_server_client.cc
-  - test/core/util/slice_splitter.cc
-  - test/core/util/trickle_endpoint.cc
+  - test/core/end2end/cq_verifier.c
+  - test/core/end2end/fixtures/http_proxy_fixture.c
+  - test/core/end2end/fixtures/proxy.c
+  - test/core/iomgr/endpoint_tests.c
+  - test/core/util/debugger_macros.c
+  - test/core/util/grpc_profiler.c
+  - test/core/util/memory_counters.c
+  - test/core/util/mock_endpoint.c
+  - test/core/util/parse_hexstring.c
+  - test/core/util/passthru_endpoint.c
+  - test/core/util/port.c
+  - test/core/util/port_server_client.c
+  - test/core/util/slice_splitter.c
+  - test/core/util/trickle_endpoint.c
   deps:
   - gpr_test_util
   - gpr
diff --git a/src/core/lib/support/env_windows.cc b/src/core/lib/support/env_windows.cc
index 652eeb61c67..73c643c5600 100644
--- a/src/core/lib/support/env_windows.cc
+++ b/src/core/lib/support/env_windows.cc
@@ -45,7 +45,7 @@ char *gpr_getenv(const char *name) {
   ret = GetEnvironmentVariable(tname, NULL, 0);
   if (ret == 0) return NULL;
   size = ret * (DWORD)sizeof(TCHAR);
-  tresult = gpr_malloc(size);
+  tresult = (LPTSTR)gpr_malloc(size);
   ret = GetEnvironmentVariable(tname, tresult, size);
   gpr_free(tname);
   if (ret == 0) {
diff --git a/src/core/lib/support/log_posix.cc b/src/core/lib/support/log_posix.cc
index 855e8e7107f..38a136e646f 100644
--- a/src/core/lib/support/log_posix.cc
+++ b/src/core/lib/support/log_posix.cc
@@ -48,7 +48,7 @@ void gpr_log(const char *file, int line, gpr_log_severity severity,
   } else if ((size_t)ret <= sizeof(buf) - 1) {
     message = buf;
   } else {
-    message = allocated = gpr_malloc((size_t)ret + 1);
+    message = allocated = (char *)gpr_malloc((size_t)ret + 1);
     va_start(args, format);
     vsnprintf(message, (size_t)(ret + 1), format, args);
     va_end(args);
diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc
index 74e55d57416..173e800f0da 100644
--- a/src/core/lib/surface/call.cc
+++ b/src/core/lib/surface/call.cc
@@ -95,9 +95,12 @@ static gpr_atm pack_received_status(received_status r) {
 
 static received_status unpack_received_status(gpr_atm atm) {
   return (atm & 1) == 0
-             ? (received_status){.is_set = false, .error = GRPC_ERROR_NONE}
-             : (received_status){.is_set = true,
-                                 .error = (grpc_error *)(atm & ~(gpr_atm)1)};
+             ? (received_status){false, /* is_set */
+               GRPC_ERROR_NONE /*error */
+             }
+             : (received_status){true, /* is_set */
+                                 (grpc_error *)(atm & ~(gpr_atm)1) /* error */
+             };
 }
 
 #define MAX_ERRORS_PER_BATCH 4