Merge "Add include paths to Makefile" into main