Part of the cleanup of builds. Remove C++ code dependencies on CUDA headers, except where curand is needed Related to #674