Initial support for compiling against CDH5