Merge "Add include/ to the Makefile include path."