Revert path changes due to DP4 fixing empty /usr/include