We had two OpenCL model files: opencl.cat and opencl_total.cat. I have factored out the common definitions into opencl_base.cat, and included that file in both of the other two.