Build fix for VS2013, boost 1.54 and new OpenCL headers