diff --git a/Makefile b/Makefile
index 64474fd25f8..701c2d84d7c 100644
--- a/Makefile
+++ b/Makefile
@@ -1094,6 +1094,8 @@ LIBGRPC_SRC = \
     src/core/httpcli/httpcli.c \
     src/core/httpcli/httpcli_security_context.c \
     src/core/httpcli/parser.c \
+    src/core/iomgr/alarm.c \
+    src/core/iomgr/alarm_heap.c \
     src/core/iomgr/endpoint.c \
     src/core/iomgr/endpoint_pair_posix.c \
     src/core/iomgr/iomgr_libevent.c \
@@ -2229,6 +2231,8 @@ LIBGRPC_UNSECURE_SRC = \
     src/core/httpcli/httpcli.c \
     src/core/httpcli/httpcli_security_context.c \
     src/core/httpcli/parser.c \
+    src/core/iomgr/alarm.c \
+    src/core/iomgr/alarm_heap.c \
     src/core/iomgr/endpoint.c \
     src/core/iomgr/endpoint_pair_posix.c \
     src/core/iomgr/iomgr_libevent.c \
diff --git a/build.json b/build.json
index 2fe11d853b3..3d961dd3aea 100644
--- a/build.json
+++ b/build.json
@@ -115,6 +115,8 @@
         "src/core/httpcli/httpcli.c",
         "src/core/httpcli/httpcli_security_context.c",
         "src/core/httpcli/parser.c",
+        "src/core/iomgr/alarm.c",
+        "src/core/iomgr/alarm_heap.c",
         "src/core/iomgr/endpoint.c",
         "src/core/iomgr/endpoint_pair_posix.c",
         "src/core/iomgr/iomgr_libevent.c",
@@ -211,6 +213,8 @@
         "src/core/httpcli/httpcli_security_context.h",
         "src/core/httpcli/parser.h",
         "src/core/iomgr/alarm.h",
+        "src/core/iomgr/alarm_heap.h",
+        "src/core/iomgr/alarm_internal.h",
         "src/core/iomgr/endpoint.h",
         "src/core/iomgr/endpoint_pair.h",
         "src/core/iomgr/iomgr_completion_queue_interface.h",
diff --git a/vsprojects/vs2013/grpc.vcxproj b/vsprojects/vs2013/grpc.vcxproj
index 391354cfe94..d892cfc8872 100644
--- a/vsprojects/vs2013/grpc.vcxproj
+++ b/vsprojects/vs2013/grpc.vcxproj
@@ -99,6 +99,8 @@
     <ClInclude Include="..\..\src\core\httpcli\httpcli_security_context.h" />
     <ClInclude Include="..\..\src\core\httpcli\parser.h" />
     <ClInclude Include="..\..\src\core\iomgr\alarm.h" />
+    <ClInclude Include="..\..\src\core\iomgr\alarm_heap.h" />
+    <ClInclude Include="..\..\src\core\iomgr\alarm_internal.h" />
     <ClInclude Include="..\..\src\core\iomgr\endpoint.h" />
     <ClInclude Include="..\..\src\core\iomgr\endpoint_pair.h" />
     <ClInclude Include="..\..\src\core\iomgr\iomgr_completion_queue_interface.h" />
@@ -202,6 +204,10 @@
     </ClCompile>
     <ClCompile Include="..\..\src\core\httpcli\parser.c">
     </ClCompile>
+    <ClCompile Include="..\..\src\core\iomgr\alarm.c">
+    </ClCompile>
+    <ClCompile Include="..\..\src\core\iomgr\alarm_heap.c">
+    </ClCompile>
     <ClCompile Include="..\..\src\core\iomgr\endpoint.c">
     </ClCompile>
     <ClCompile Include="..\..\src\core\iomgr\endpoint_pair_posix.c">