Reverted r725 because it caused all tests using cl.hpp to segfault on CentOS x86_64 and ARM. Added cl.hpp to CLEANFILES.