Merge "build: Clean up makefile inclusions" into p9.0