Merge "Revert "Fix makefile include hierarchy""