better cleanup and include path for non-standard builds