Merge "Fix makefile include hierarchy"