Build error after recent changes

Building Blender
1 
[100%] Linking CXX executable ../../bin/blender
../../lib/libcycles_device.a(device_cpu.cpp.o):device_cpu.cpp:function ccl::CPUDevice::const_copy_to(char const*, void*, unsigned long): error: undefined reference to 'ccl::kernel_const_copy(ccl::KernelGlobals*, char const*, void*, unsigned long)'
../../lib/libcycles_device.a(device_cpu.cpp.o):device_cpu.cpp:function ccl::CPUDevice::mem_copy_to(ccl::device_memory&): error: undefined reference to 'ccl::kernel_global_memory_copy(ccl::KernelGlobals*, char const*, void*, unsigned long)'
../../lib/libcycles_device.a(device_cpu.cpp.o):device_cpu.cpp:function ccl::CPUDevice::CPUDevice(ccl::DeviceInfo&, ccl::Stats&, ccl::Profiler&, bool): error: undefined reference to 'ccl::kernel_cpu_path_trace(ccl::KernelGlobals*, float*, int, int, int, int, int)'
../../lib/libcycles_device.a(device_cpu.cpp.o):device_cpu.cpp:function ccl::CPUDevice::CPUDevice(ccl::DeviceInfo&, ccl::Stats&, ccl::Profiler&, bool): error: undefined reference to 'ccl::kernel_cpu_convert_to_half_float(ccl::KernelGlobals*, ccl::uchar4*, float*, float, int, int, int, int)'
../../lib/libcycles_device.a(device_cpu.cpp.o):device_cpu.cpp:function ccl::CPUDevice::CPUDevice(ccl::DeviceInfo&, ccl::Stats&, ccl::Profiler&, bool): error: undefined reference to 'ccl::kernel_cpu_convert_to_byte(ccl::KernelGlobals*, ccl::uchar4*, float*, float, int, int, int, int)'
../../lib/libcycles_device.a(device_cpu.cpp.o):device_cpu.cpp:function ccl::CPUDevice::CPUDevice(ccl::DeviceInfo&, ccl::Stats&, ccl::Profiler&, bool): error: undefined reference to 'ccl::kernel_cpu_shader(ccl::KernelGlobals*, ccl::uint4*, ccl::float4*, int, int, int, int, int)'
../../lib/libcycles_device.a(device_cpu.cpp.o):device_cpu.cpp:function ccl::CPUDevice::CPUDevice(ccl::DeviceInfo&, ccl::Stats&, ccl::Profiler&, bool): error: undefined reference to 'ccl::kernel_cpu_bake(ccl::KernelGlobals*, float*, int, int, int, int, int)'
collect2: error: ld returned 1 exit status
make[2]: *** [source/creator/CMakeFiles/blender.dir/build.make:472: bin/blender] Error 1
make[1]: *** [CMakeFiles/Makefile2:6918: source/creator/CMakeFiles/blender.dir/all] Error 2
make: *** [Makefile:163: all] Error 2
2

Best to post a full build log, odds are something earlier on went wrong.