diff --git a/core/binary.mk b/core/binary.mk
index c8692a832..07a8117d1 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -743,7 +743,13 @@ aidl_gen_include_root := $(intermediates)/aidl-generated/include
 # Thus we'll actually generate source for each architecture.
 $(foreach s,$(aidl_src),\
     $(eval $(call define-aidl-cpp-rule,$(s),$(aidl_gen_cpp_root),aidl_gen_cpp)))
--include $(addsuffix .P,$(basename $(aidl_gen_cpp)))
+ifeq ($(BUILDING_WITH_NINJA),true)
+$(foreach cpp,$(aidl_gen_cpp), \
+    $(eval $(cpp) : .KATI_DEPFILE := $(addsuffix .aidl.P,$(basename $(cpp)))))
+else
+  -include $(addsuffix .aidl.P,$(basename $(aidl_gen_cpp)))
+endif
+
 
 $(aidl_gen_cpp) : PRIVATE_MODULE := $(LOCAL_MODULE)
 $(aidl_gen_cpp) : PRIVATE_HEADER_OUTPUT_DIR := $(aidl_gen_include_root)
diff --git a/core/definitions.mk b/core/definitions.mk
index e919cfd30..2105df3e9 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -971,7 +971,7 @@ define transform-aidl-to-cpp
 @mkdir -p $(dir $@)
 @mkdir -p $(PRIVATE_HEADER_OUTPUT_DIR)
 @echo "Generating C++ from AIDL: $(PRIVATE_MODULE) <= $<"
-$(hide) $(AIDL_CPP) -d$(basename $@).P $(PRIVATE_AIDL_FLAGS) \
+$(hide) $(AIDL_CPP) -d$(basename $@).aidl.P $(PRIVATE_AIDL_FLAGS) \
     $< $(PRIVATE_HEADER_OUTPUT_DIR) $@
 endef