Add support for the latest third-party libraries. Contributed by Jordan Bancino.