diff --git a/build/core/apicheck.mk b/build/tasks/apicheck.mk
similarity index 97%
rename from build/core/apicheck.mk
rename to build/tasks/apicheck.mk
index d9fb488..219e924 100644
--- a/build/core/apicheck.mk
+++ b/build/tasks/apicheck.mk
@@ -41,6 +41,8 @@
 # (See vendor/cmsdk/Android.mk)
 # we need to add api-stubs as additional dependency of the api check.
 
+$(INTERNAL_CM_PLATFORM_API_FILE): cm-api-stubs-docs
+
 # Check that the API we're building hasn't broken the last-released
 # SDK version.
 $(eval $(call check-api, \
@@ -87,6 +89,8 @@
 .PHONY: check-cm-system-api
 checkapi-cm : check-cm-system-api
 
+$(INTERNAL_CM_PLATFORM_SYSTEM_API_FILE): cm-system-api-stubs-docs
+
 # Check that the System API we're building hasn't broken the last-released
 # SDK version.
 $(eval $(call check-api, \