We may need to patch and submit these patches upstream instead. Also, are any of these build-time dependencies?