Merge "Remove superfluous include path from Makefile"