Ensure more conservative handling of possible library includes