Merge "Add dependencies on included makefiles."