Incorporate all include dirs in include paths.  Ensure we don't stomp on path variables.